From ad428945283f54f2119d604e4df64c568b3843aa Mon Sep 17 00:00:00 2001 From: sogabe Date: Thu, 9 Sep 2010 04:02:37 +0000 Subject: [PATCH] Fixed warnings of PMD. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@34579 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/ComputerSet.java | 2 +- .../java/hudson/model/DirectoryBrowserSupport.java | 2 +- core/src/main/java/hudson/model/Hudson.java | 2 +- .../main/java/hudson/model/RunParameterValue.java | 1 - core/src/main/java/hudson/model/UpdateSite.java | 2 -- core/src/main/java/hudson/tasks/Ant.java | 2 +- core/src/main/java/hudson/tasks/Maven.java | 2 +- .../tasks/test/AggregatedTestResultPublisher.java | 13 ++++++++++--- .../hudson/maven/agent/PluginManagerListener.java | 2 -- .../src/main/java/hudson/maven/MavenModule.java | 4 ++-- 10 files changed, 17 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java index 8f2e15422f..4d3f59d218 100644 --- a/core/src/main/java/hudson/model/ComputerSet.java +++ b/core/src/main/java/hudson/model/ComputerSet.java @@ -301,7 +301,7 @@ public final class ComputerSet extends AbstractModelObject { /** * Accepts submission from the configuration page. */ - public final synchronized void doConfigSubmit( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException, FormException { + public synchronized void doConfigSubmit( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException, FormException { BulkChange bc = new BulkChange(MONITORS_OWNER); try { Hudson.getInstance().checkPermission(Hudson.ADMINISTER); diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java index a6cc8aa1b4..7e1fdee56e 100644 --- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java +++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java @@ -129,7 +129,7 @@ public final class DirectoryBrowserSupport implements HttpResponse { * Instead of calling this method explicitly, just return the {@link DirectoryBrowserSupport} object * from the {@code doXYZ} method and let Stapler generate a response for you. */ - public final void serveFile(StaplerRequest req, StaplerResponse rsp, FilePath root, String icon, boolean serveDirIndex) throws IOException, ServletException, InterruptedException { + public void serveFile(StaplerRequest req, StaplerResponse rsp, FilePath root, String icon, boolean serveDirIndex) throws IOException, ServletException, InterruptedException { // handle form submission String pattern = req.getParameter("pattern"); if(pattern==null) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 89245e7e6e..4b0ca1fe1b 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -802,7 +802,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl /** * Does this {@link View} has any associated user information recorded? */ - public final boolean hasPeople() { + public boolean hasPeople() { return View.People.isApplicable(items.values()); } diff --git a/core/src/main/java/hudson/model/RunParameterValue.java b/core/src/main/java/hudson/model/RunParameterValue.java index 01a25cd4d5..ea811ecee2 100644 --- a/core/src/main/java/hudson/model/RunParameterValue.java +++ b/core/src/main/java/hudson/model/RunParameterValue.java @@ -24,7 +24,6 @@ package hudson.model; import java.util.Locale; -import java.util.Map; import hudson.EnvVars; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index 9709481993..7f699c717f 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -35,7 +35,6 @@ import hudson.util.VersionNumber; import static hudson.util.TimeUnit2.DAYS; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.jvnet.hudson.crypto.CertificateUtil; @@ -68,7 +67,6 @@ import java.security.cert.TrustAnchor; import com.trilead.ssh2.crypto.Base64; import javax.servlet.ServletContext; -import javax.servlet.ServletException; /** diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java index 2e20e71c06..6ef4c5c431 100644 --- a/core/src/main/java/hudson/tasks/Ant.java +++ b/core/src/main/java/hudson/tasks/Ant.java @@ -115,7 +115,7 @@ public class Ant extends Builder { */ public AntInstallation getAnt() { for( AntInstallation i : getDescriptor().getInstallations() ) { - if(antName!=null && i.getName().equals(antName)) + if(antName!=null && antName.equals(i.getName())) return i; } return null; diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 448bd23bfc..b384b4cd57 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -151,7 +151,7 @@ public class Maven extends Builder { */ public MavenInstallation getMaven() { for( MavenInstallation i : getDescriptor().getInstallations() ) { - if(mavenName !=null && i.getName().equals(mavenName)) + if(mavenName !=null && mavenName.equals(i.getName())) return i; } return null; diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java index 54e81533ad..0d04a0051a 100644 --- a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java +++ b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java @@ -23,12 +23,19 @@ */ package hudson.tasks.test; +import hudson.model.AbstractBuild; +import hudson.model.AbstractProject; import hudson.Extension; import hudson.Launcher; import hudson.Util; import static hudson.Util.fixNull; -import hudson.model.*; +import hudson.model.BuildListener; import hudson.model.Fingerprint.RangeSet; +import hudson.model.Hudson; +import hudson.model.Item; +import hudson.model.Result; +import hudson.model.Run; +import hudson.model.TaskListener; import hudson.model.listeners.RunListener; import hudson.tasks.BuildStepDescriptor; import hudson.tasks.BuildStepMonitor; @@ -161,7 +168,7 @@ public class AggregatedTestResultPublisher extends Recorder { * so that IDE warns you if you accidentally try to call it. */ @Override - protected final String getDescription(TestObject object) { + protected String getDescription(TestObject object) { throw new AssertionError(); } @@ -172,7 +179,7 @@ public class AggregatedTestResultPublisher extends Recorder { * so that IDE warns you if you accidentally try to call it. */ @Override - protected final void setDescription(TestObject object, String description) { + protected void setDescription(TestObject object, String description) { throw new AssertionError(); } diff --git a/maven-interceptor/src/main/java/hudson/maven/agent/PluginManagerListener.java b/maven-interceptor/src/main/java/hudson/maven/agent/PluginManagerListener.java index 86ada31daf..c3b8f84b85 100644 --- a/maven-interceptor/src/main/java/hudson/maven/agent/PluginManagerListener.java +++ b/maven-interceptor/src/main/java/hudson/maven/agent/PluginManagerListener.java @@ -31,10 +31,8 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.MavenReport; import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import org.codehaus.doxia.sink.Sink; import java.io.IOException; -import java.util.Locale; /** * Receives notification from {@link PluginManagerInterceptor}, diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index 25cd3e36fa..729e342a1f 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -171,7 +171,7 @@ public final class MavenModule extends AbstractMavenProject createReporters() { + protected List createReporters() { List reporterList = new ArrayList(); getReporters().addAllTo(reporterList);