changed the MavenModuleSetBuild result computation logic (#651)

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3793 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2007-07-23 01:45:56 +00:00
1 parent 74ddfd01e1
commit a65b5ea920
1 file changed
+34 -10
@@ -55,21 +55,23 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
}
/**
* Displays the combined status of all modules.
* Displays the combined status of all modules.
* <p>
* More precisely, this picks up the status of this build itself,
* plus all the latest builds of the modules that belongs to this build.
*/
@Override
public Result getResult() {
Result r = super.getResult();
for (List<MavenBuild> list : getModuleBuilds().values())
for (MavenBuild build : list) {
Result br = build.getResult();
if(r==null)
r = br;
else
if(br!=null)
r = r.combine(br);
}
for (MavenBuild b : getModuleLastBuilds().values()) {
Result br = b.getResult();
if(r==null)
r = br;
else
if(br!=null)
r = r.combine(br);
}
return r;
}
@@ -103,6 +105,28 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
return r;
}
/**
* Computes the latest module builds that correspond to this build.
*/
public Map<MavenModule,MavenBuild> getModuleLastBuilds() {
Collection<MavenModule> mods = getParent().getModules();
// identify the build number range. [start,end)
MavenModuleSetBuild nb = getNextBuild();
int end = nb!=null ? nb.getNumber() : Integer.MAX_VALUE;
// preserve the order by using LinkedHashMap
Map<MavenModule,MavenBuild> r = new LinkedHashMap<MavenModule,MavenBuild>(mods.size());
for (MavenModule m : mods) {
MavenBuild b = m.getNearestOldBuild(end - 1);
if(b.getNumber()>=getNumber())
r.put(m,b);
}
return r;
}
/**
* Finds {@link Action}s from all the module builds that belong to this
* {@link MavenModuleSetBuild}. One action per one {@link MavenModule},