Using String like enum isn't type safe.

This commit is contained in:
Kohsuke Kawaguchi committed 2011-09-23 23:25:13 -07:00
1 parent ac6a020055
commit 1f7c75d7e5
2 files changed
+13 -30

No files matched your search

@@ -794,7 +794,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
throw e;
} finally {
// only run post build steps if requested...
if(shouldPostStepsRun(r, project.getRunPostStepsIfResult())){
if (r==null || r.isBetterOrEqualTo(project.getRunPostStepsIfResult())) {
if(!build(listener,project.getPostbuilders().toList())){
r = FAILURE;
}
@@ -864,29 +864,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
return true;
}
private boolean shouldPostStepsRun(Result buildResult, String runIfResult) {
// If runIfResult is null, set it to "allCases".
if (runIfResult == null) {
runIfResult = "allCases";
}
// If runIfResult is "allCases", we're running regardless.
if (runIfResult.equals("allCases")) {
return true;
}
else {
// Otherwise, we're going to need to compare against the build result.
if (runIfResult.equals("success")) {
return ((buildResult==null) || (buildResult.isBetterOrEqualTo(Result.SUCCESS)));
}
else if (runIfResult.equals("unstable")) {
return ((buildResult==null) || (buildResult.isBetterOrEqualTo(Result.UNSTABLE)));
}
}
// If we get down here, something weird's going on. Return false.
return false;
}
/**
* Returns the modules which have not been build since the last successful aggregator build
* though they should be because they had SCM changes.