From 41e511e18794cb15f7102300006fdff950a386f5 Mon Sep 17 00:00:00 2001 From: kutzi Date: Sat, 23 Oct 2010 16:35:29 +0000 Subject: [PATCH] fixed PMD and some Checkstyle warnings git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@36168 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Run.java | 12 +++++++----- .../main/java/hudson/maven/MavenModuleSetBuild.java | 6 ++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 5fc8a886c0..ca515a2a5d 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -691,26 +691,28 @@ public abstract class Run ,RunT extends Run= 'threshold' + * Returns the last 'numberOfBuilds' builds with a build result >= 'threshold'. * + * @param numberOfBuilds the desired number of builds + * @param threshold the build result threshold * @return a list with the builds (youngest build first). * May be smaller than 'numberOfBuilds' or even empty * if not enough builds satisfying the threshold have been found. Never null. * @since 1.383 */ public List getPreviousBuildsOverThreshold(int numberOfBuilds, Result threshold) { - List result = new ArrayList(numberOfBuilds); + List builds = new ArrayList(numberOfBuilds); RunT r = getPreviousBuild(); - while (r != null && result.size() < numberOfBuilds) { + while (r != null && builds.size() < numberOfBuilds) { if (!r.isBuilding() && (r.getResult() != null && r.getResult().isBetterOrEqualTo(threshold))) { - result.add(r); + builds.add(r); } r = r.getPreviousBuild(); } - return result; + return builds; } public RunT getNextBuild() { diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index e735d264f1..dd3736ac96 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -230,10 +230,8 @@ public class MavenModuleSetBuild extends AbstractMavenBuild builds : moduleBuilds.values()) { if (!builds.isEmpty()) { MavenBuild build = builds.get(0); - if (build.getResult() != Result.NOT_BUILT) { - if (build.getEstimatedDuration() != -1) { - result += build.getEstimatedDuration(); - } + if (build.getResult() != Result.NOT_BUILT && build.getEstimatedDuration() != -1) { + result += build.getEstimatedDuration(); } } }