diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index bb6bfdb26f..30f5cf4687 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -1340,6 +1340,7 @@ public final class FilePath implements Serializable { setProject(new org.apache.tools.ant.Project()); } + @Override protected void doFileOperations() { copySize = super.fileCopyMap.size(); super.doFileOperations(); @@ -1451,6 +1452,7 @@ public final class FilePath implements Serializable { this.filter = filter; } + @Override void scan(File dir, FileVisitor visitor) throws IOException { super.scan(dir,visitor.with(filter)); } @@ -1575,6 +1577,7 @@ public final class FilePath implements Serializable { // TarOutputStream uses TarBuffer internally, // which flushes the stream for each block. this creates unnecessary // data stream fragmentation, and flush request to a remote, which slows things down. + @Override public void flush() throws IOException { // so don't do anything in flush } @@ -1967,7 +1970,7 @@ public final class FilePath implements Serializable { return validateRelativeDirectory(value,true); } - @Deprecated + @Deprecated @Override public String toString() { // to make writing JSPs easily, return local return remote; diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java index 53dbf20fd0..f9bfccec56 100644 --- a/core/src/main/java/hudson/Launcher.java +++ b/core/src/main/java/hudson/Launcher.java @@ -670,12 +670,14 @@ public abstract class Launcher { /** * Kill the process when the channel is severed. */ + @Override protected synchronized void terminate(IOException e) { super.terminate(e); ProcessTree pt = ProcessTree.get(); pt.killAll(proc,cookie); } + @Override public synchronized void close() throws IOException { super.close(); // wait for all the output from the process to be picked up diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index 32fae64d1a..d818373983 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -1,3 +1,26 @@ +/* + * The MIT License + * + * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package hudson; import hudson.model.TaskListener; diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java index ee42919b41..d4fb409efa 100644 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java @@ -69,6 +69,7 @@ public class MatrixConfiguration extends Project setCombination(c); } + @Override public void onLoad(ItemGroup parent, String name) throws IOException { // directory name is not a name for us --- it's taken from the combination name super.onLoad(parent, combination.toString()); @@ -115,6 +116,7 @@ public class MatrixConfiguration extends Project return n; } + @Override public int assignBuildNumber() throws IOException { int nb = getNextBuildNumber(); MatrixRun r = getLastBuild(); @@ -128,6 +130,7 @@ public class MatrixConfiguration extends Project return combination.toCompactString(getParent().getAxes()); } + @Override public MatrixProject getParent() { return (MatrixProject)super.getParent(); } @@ -187,6 +190,7 @@ public class MatrixConfiguration extends Project protected void buildDependencyGraph(DependencyGraph graph) { } + @Override public MatrixConfiguration asProject() { return this; } @@ -259,6 +263,7 @@ public class MatrixConfiguration extends Project * @deprecated * Not supported. */ + @Override public void setJDK(JDK jdk) throws IOException { throw new UnsupportedOperationException(); } @@ -267,6 +272,7 @@ public class MatrixConfiguration extends Project * @deprecated * Value is controlled by {@link MatrixProject}. */ + @Override public void setLogRotator(LogRotator logRotator) { throw new UnsupportedOperationException(); } @@ -305,8 +311,7 @@ public class MatrixConfiguration extends Project * @param parameters * Can be null. */ - public boolean scheduleBuild(ParametersAction parameters, Cause c) { + public boolean scheduleBuild(ParametersAction parameters, Cause c) { return Hudson.getInstance().getQueue().schedule(this, getQuietPeriod(), parameters, new CauseAction(c))!=null; - } - + } } diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index 00fd178be4..f1149b859a 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -185,15 +185,15 @@ public class MatrixProject extends AbstractProject im /** * Sets the combination filter. * - * @param combinationFilter the combinationFilter to set - */ - public void setCombinationFilter(String combinationFilter) throws IOException { - this.combinationFilter = combinationFilter; - rebuildConfigurations(); - save(); - } + * @param combinationFilter the combinationFilter to set + */ + public void setCombinationFilter(String combinationFilter) throws IOException { + this.combinationFilter = combinationFilter; + rebuildConfigurations(); + save(); + } - /** + /** * Obtains the combination filter, used to trim down the size of the matrix. * *

@@ -204,14 +204,14 @@ public class MatrixProject extends AbstractProject im * Namely, this expression is evaluated for each axis value combination, and only when it evaluates to true, * a corresponding {@link MatrixConfiguration} will be created and built. * - * @return can be null. + * @return can be null. * @since 1.279 - */ - public String getCombinationFilter() { - return combinationFilter; - } + */ + public String getCombinationFilter() { + return combinationFilter; + } - public String getTouchStoneCombinationFilter() { + public String getTouchStoneCombinationFilter() { return touchStoneCombinationFilter; } @@ -228,6 +228,7 @@ public class MatrixProject extends AbstractProject im this.touchStoneResultCondition = touchStoneResultCondition; } + @Override protected void updateTransientActions() { synchronized(transientActions) { super.updateTransientActions(); @@ -274,6 +275,7 @@ public class MatrixProject extends AbstractProject im }; } + @Override public void onLoad(ItemGroup parent, String name) throws IOException { super.onLoad(parent,name); Collections.sort(axes); // perhaps the file was edited on disk and the sort order might have been broken @@ -283,6 +285,7 @@ public class MatrixProject extends AbstractProject im rebuildConfigurations(); } + @Override public void logRotate() throws IOException, InterruptedException { super.logRotate(); // perform the log rotation of inactive configurations to make sure @@ -452,6 +455,7 @@ public class MatrixProject extends AbstractProject im return f; } + @Override public Hudson getParent() { return Hudson.getInstance(); } @@ -540,6 +544,7 @@ public class MatrixProject extends AbstractProject im return this; } + @Override public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) { try { MatrixConfiguration item = getItem(token); @@ -551,6 +556,7 @@ public class MatrixProject extends AbstractProject im return super.getDynamic(token,req,rsp); } + @Override protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException { super.submit(req, rsp); diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java index 4a8ab79a9a..9994b15c48 100644 --- a/core/src/main/java/hudson/model/Cause.java +++ b/core/src/main/java/hudson/model/Cause.java @@ -53,45 +53,45 @@ public abstract class Cause { *

* By default, this method is used to render HTML as well. */ - @Exported(visibility=3) - abstract public String getShortDescription(); + @Exported(visibility=3) + abstract public String getShortDescription(); /** * Fall back implementation when no other type is available. */ - public static class LegacyCodeCause extends Cause { - private StackTraceElement [] stackTrace; - public LegacyCodeCause() { - stackTrace = new Exception().getStackTrace(); - } - - @Override - public String getShortDescription() { - return Messages.Cause_LegacyCodeCause_ShortDescription(); - } - } - + public static class LegacyCodeCause extends Cause { + private StackTraceElement [] stackTrace; + public LegacyCodeCause() { + stackTrace = new Exception().getStackTrace(); + } + + @Override + public String getShortDescription() { + return Messages.Cause_LegacyCodeCause_ShortDescription(); + } + } + /** * A build is triggered by the completion of another build (AKA upstream build.) */ - public static class UpstreamCause extends Cause { - private String upstreamProject, upstreamUrl; - private int upstreamBuild; - @Deprecated - private transient Cause upstreamCause; - private List upstreamCauses; - - // for backward bytecode compatibility - public UpstreamCause(AbstractBuild up) { - this((Run)up); - } - - public UpstreamCause(Run up) { - upstreamBuild = up.getNumber(); - upstreamProject = up.getParent().getName(); - upstreamUrl = up.getParent().getUrl(); - upstreamCauses = new ArrayList(up.getCauses()); - } + public static class UpstreamCause extends Cause { + private String upstreamProject, upstreamUrl; + private int upstreamBuild; + @Deprecated + private transient Cause upstreamCause; + private List upstreamCauses; + + // for backward bytecode compatibility + public UpstreamCause(AbstractBuild up) { + this((Run)up); + } + + public UpstreamCause(Run up) { + upstreamBuild = up.getNumber(); + upstreamProject = up.getParent().getName(); + upstreamUrl = up.getParent().getUrl(); + upstreamCauses = new ArrayList(up.getCauses()); + } public String getUpstreamProject() { return upstreamProject; @@ -104,41 +104,41 @@ public abstract class Cause { public String getUpstreamUrl() { return upstreamUrl; } - - @Override - public String getShortDescription() { - return Messages.Cause_UpstreamCause_ShortDescription(upstreamProject, Integer.toString(upstreamBuild)); - } - - private Object readResolve() { - if(upstreamCause != null) { - if(upstreamCauses == null) upstreamCauses = new ArrayList(); - upstreamCauses.add(upstreamCause); - upstreamCause=null; - } - return this; - } - } + + @Override + public String getShortDescription() { + return Messages.Cause_UpstreamCause_ShortDescription(upstreamProject, Integer.toString(upstreamBuild)); + } + + private Object readResolve() { + if(upstreamCause != null) { + if(upstreamCauses == null) upstreamCauses = new ArrayList(); + upstreamCauses.add(upstreamCause); + upstreamCause=null; + } + return this; + } + } /** * A build is started by an user action. */ - public static class UserCause extends Cause { - private String authenticationName; - public UserCause() { - this.authenticationName = Hudson.getAuthentication().getName(); - } + public static class UserCause extends Cause { + private String authenticationName; + public UserCause() { + this.authenticationName = Hudson.getAuthentication().getName(); + } @Exported public String getUserName() { return authenticationName; } - @Override - public String getShortDescription() { - return Messages.Cause_UserCause_ShortDescription(authenticationName); - } - } + @Override + public String getShortDescription() { + return Messages.Cause_UserCause_ShortDescription(authenticationName); + } + } public static class RemoteCause extends Cause { private String addr; diff --git a/core/src/main/java/hudson/model/FingerprintMap.java b/core/src/main/java/hudson/model/FingerprintMap.java index 92e015c1ce..48c960245c 100644 --- a/core/src/main/java/hudson/model/FingerprintMap.java +++ b/core/src/main/java/hudson/model/FingerprintMap.java @@ -72,6 +72,7 @@ public final class FingerprintMap extends KeyedDataStorage, Stapl public CloudList() {// needed for XStream deserialization } + @Override protected void onModified() throws IOException { super.onModified(); Hudson.getInstance().trimLabels(); @@ -662,7 +663,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl * * @deprecated */ - @Deprecated + @Deprecated @Override public String getNodeName() { return ""; } @@ -1288,6 +1289,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl return queue; } + @Override public String getDisplayName() { return Messages.Hudson_DisplayName(); } @@ -1601,6 +1603,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl return new FilePath(getRootDir()); } + @Override public FilePath createPath(String absolutePath) { return new FilePath((VirtualChannel)null,absolutePath); } @@ -1722,6 +1725,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl * * @see AuthorizationStrategy#getRootACL() */ + @Override public ACL getACL() { return authorizationStrategy.getRootACL(); } @@ -1940,6 +1944,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl return fixNull(label).trim(); } + @Override public Label getSelfLabel() { return getLabel("master"); } @@ -2636,6 +2641,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl rsp.sendRedirect2(req.getContextPath()+"/"); new Thread("Hudson config reload thread") { + @Override public void run() { try { load(); @@ -3160,6 +3166,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl /** * Returns "" to match with {@link Hudson#getNodeName()}. */ + @Override public String getName() { return ""; } @@ -3179,6 +3186,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl return Messages.Hudson_Computer_Caption(); } + @Override public String getUrl() { return "computer/(master)/"; } @@ -3195,6 +3203,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl rsp.sendError(SC_BAD_REQUEST); } + @Override public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { // the master node isn't in the Hudson.getNodes(), so this method makes no sense. throw new UnsupportedOperationException(); diff --git a/core/src/main/java/hudson/model/ParameterDefinition.java b/core/src/main/java/hudson/model/ParameterDefinition.java index 4f4a808449..b841e31a0a 100644 --- a/core/src/main/java/hudson/model/ParameterDefinition.java +++ b/core/src/main/java/hudson/model/ParameterDefinition.java @@ -96,7 +96,7 @@ public abstract class ParameterDefinition implements private final String name; - private final String description; + private final String description; public ParameterDefinition(String name) { this(name, null); @@ -107,12 +107,12 @@ public abstract class ParameterDefinition implements this.description = description; } - @Exported + @Exported public String getName() { return name; } - @Exported + @Exported public String getDescription() { return description; } @@ -146,7 +146,7 @@ public abstract class ParameterDefinition implements * @return default parameter value or null if no defaults are available * @since 1.253 */ - @Exported + @Exported public ParameterValue getDefaultParameterValue() { return null; } diff --git a/core/src/main/java/hudson/model/ParameterValue.java b/core/src/main/java/hudson/model/ParameterValue.java index a431eaa090..3f246b8a4c 100644 --- a/core/src/main/java/hudson/model/ParameterValue.java +++ b/core/src/main/java/hudson/model/ParameterValue.java @@ -64,7 +64,7 @@ import org.kohsuke.stapler.export.ExportedBean; */ @ExportedBean(defaultVisibility=3) public abstract class ParameterValue implements Serializable { - protected final String name; + protected final String name; private String description; @@ -172,29 +172,29 @@ public abstract class ParameterValue implements Serializable { } @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - return result; - } + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + return result; + } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ParameterValue other = (ParameterValue) obj; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - return true; - } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ParameterValue other = (ParameterValue) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + return true; + } /** * Computes a human-readable possible-localized one-line description of the parameter value. diff --git a/core/src/main/java/hudson/model/ParametersAction.java b/core/src/main/java/hudson/model/ParametersAction.java index 50c83fabcf..c717b0635d 100644 --- a/core/src/main/java/hudson/model/ParametersAction.java +++ b/core/src/main/java/hudson/model/ParametersAction.java @@ -38,7 +38,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -64,7 +63,7 @@ public class ParametersAction implements Action, Iterable, Queue } public ParametersAction(ParameterValue... parameters) { - this(Arrays.asList(parameters)); + this(Arrays.asList(parameters)); } public void createBuildWrappers(AbstractBuild build, Collection result) { @@ -127,18 +126,17 @@ public class ParametersAction implements Action, Iterable, Queue /** * Allow an other build of the same project to be scheduled, if it has other parameters. */ - public boolean shouldSchedule(List actions) { - List others = Util.filter(actions, ParametersAction.class); - if (others.isEmpty()) { - return !parameters.isEmpty(); - } else { - // I don't think we need multiple ParametersActions, but let's be defensive - Set parameters = new HashSet(); - for (ParametersAction other: others) { - parameters.addAll(other.parameters); - } - return !parameters.equals(new HashSet(this.parameters)); - } - } - + public boolean shouldSchedule(List actions) { + List others = Util.filter(actions, ParametersAction.class); + if (others.isEmpty()) { + return !parameters.isEmpty(); + } else { + // I don't think we need multiple ParametersActions, but let's be defensive + Set parameters = new HashSet(); + for (ParametersAction other: others) { + parameters.addAll(other.parameters); + } + return !parameters.equals(new HashSet(this.parameters)); + } + } } diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java index 666306ae85..35aee90b9b 100644 --- a/core/src/main/java/hudson/model/Project.java +++ b/core/src/main/java/hudson/model/Project.java @@ -81,6 +81,7 @@ public abstract class Project

,B extends Build> super(parent,name); } + @Override public void onLoad(ItemGroup parent, String name) throws IOException { super.onLoad(parent, name); @@ -197,6 +198,7 @@ public abstract class Project

,B extends Build> updateTransientActions(); // to pick up transient actions from builder, publisher, etc. } + @Override protected void updateTransientActions() { synchronized(transientActions) { super.updateTransientActions(); @@ -230,4 +232,4 @@ public abstract class Project

,B extends Build> */ @Deprecated private transient String slave; -} \ No newline at end of file +} diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index c761781ae2..f5e4305213 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -273,7 +273,7 @@ public class Queue extends ResourceController implements Saveable { } } } catch (IOException e) { - LOGGER.log(Level.WARNING, "Failed to load the queue file " + getQueueFile(), e); + LOGGER.log(Level.WARNING, "Failed to load the queue file " + getXMLQueueFile(), e); } } @@ -293,7 +293,7 @@ public class Queue extends ResourceController implements Saveable { try { new XmlFile(XSTREAM, getXMLQueueFile()).write(items); } catch (IOException e) { - LOGGER.log(Level.WARNING, "Failed to write out the queue file " + getQueueFile(), e); + LOGGER.log(Level.WARNING, "Failed to write out the queue file " + getXMLQueueFile(), e); } } @@ -1062,7 +1062,7 @@ public class Queue extends ResourceController implements Saveable { /** * Used to render the HTML. Should be a human readable text of what this executable is. */ - String toString(); + @Override String toString(); } /*package*/ static final class FutureImpl extends AsyncFutureImpl { diff --git a/core/src/main/java/hudson/model/Result.java b/core/src/main/java/hudson/model/Result.java index 9c715d7289..b41118b759 100644 --- a/core/src/main/java/hudson/model/Result.java +++ b/core/src/main/java/hudson/model/Result.java @@ -105,6 +105,7 @@ public final class Result implements Serializable, CustomExportedBean { } + @Override public String toString() { return name; } diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 9721a17127..469e4dbfb6 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -543,6 +543,7 @@ public abstract class Run ,RunT extends Run,RunT extends Run,RunT extends Run,RunT extends Run extends Descriptor { @Override public Collection getAffectedFiles() { - return files; + return files; } } @@ -252,7 +252,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { * Inherited from AffectedFile */ public String getPath() { - return getName(); + return getName(); } /** @@ -400,6 +400,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { return new Revision(p); } + @Override public String toString() { StringBuilder buf = new StringBuilder(); for (int n : numbers) { diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java index 3d7c326b30..1d514c3650 100644 --- a/core/src/main/java/hudson/scm/CVSSCM.java +++ b/core/src/main/java/hudson/scm/CVSSCM.java @@ -148,7 +148,7 @@ public class CVSSCM extends SCM implements Serializable { private boolean isTag; - private String excludedRegions; + private String excludedRegions; @DataBoundConstructor public CVSSCM(String cvsRoot, String allModules,String branch,String cvsRsh,boolean canUseUpdate, boolean legacy, boolean isTag, String excludedRegions) { @@ -162,7 +162,7 @@ public class CVSSCM extends SCM implements Serializable { this.canUseUpdate = canUseUpdate; this.flatten = !legacy && getAllModulesNormalized().length==1; this.isTag = isTag; - this.excludedRegions = excludedRegions; + this.excludedRegions = excludedRegions; } @Override @@ -208,6 +208,7 @@ public class CVSSCM extends SCM implements Serializable { return workspace.child(getAllModulesNormalized()[0]); } + @Override public FilePath[] getModuleRoots(FilePath workspace) { if (!flatten) { final String[] moduleLocations = getAllModulesNormalized(); @@ -228,18 +229,17 @@ public class CVSSCM extends SCM implements Serializable { return module; } - public String getExcludedRegions() { - return excludedRegions; - } + public String getExcludedRegions() { + return excludedRegions; + } - public String[] getExcludedRegionsNormalized() { - return excludedRegions == null ? null : excludedRegions.split("[\\r\\n]+"); - } + public String[] getExcludedRegionsNormalized() { + return excludedRegions == null ? null : excludedRegions.split("[\\r\\n]+"); + } - private Pattern[] getExcludedRegionsPatterns() { - String[] excludedRegions = getExcludedRegionsNormalized(); - if (excludedRegions != null) - { + private Pattern[] getExcludedRegionsPatterns() { + String[] excludedRegions = getExcludedRegionsNormalized(); + if (excludedRegions != null) { Pattern[] patterns = new Pattern[excludedRegions.length]; int i = 0; @@ -249,10 +249,10 @@ public class CVSSCM extends SCM implements Serializable { } return patterns; - } + } - return null; - } + return null; + } /** * List up all modules to check out. @@ -832,6 +832,7 @@ public class CVSSCM extends SCM implements Serializable { final boolean[] hadError = new boolean[1]; ChangeLogTask task = new ChangeLogTask() { + @Override public void log(String msg, int msgLevel) { if(msgLevel==org.apache.tools.ant.Project.MSG_ERR) hadError[0] = true; @@ -929,10 +930,12 @@ public class CVSSCM extends SCM implements Serializable { } } + @Override public DescriptorImpl getDescriptor() { return (DescriptorImpl)super.getDescriptor(); } + @Override public void buildEnvVars(AbstractBuild build, Map env) { if(cvsRsh!=null) env.put("CVS_RSH",cvsRsh); @@ -1075,6 +1078,7 @@ public class CVSSCM extends SCM implements Serializable { load(); } + @Override protected void convert(Map oldPropertyBag) { cvsPassFile = (String)oldPropertyBag.get("cvspass"); } @@ -1115,6 +1119,7 @@ public class CVSSCM extends SCM implements Serializable { return noCompression; } + @Override public boolean configure( StaplerRequest req, JSONObject o ) { cvsPassFile = fixEmptyAndTrim(req.getParameter("cvspassFile")); cvsExe = fixEmptyAndTrim(o.getString("cvsExe")); @@ -1253,7 +1258,7 @@ public class CVSSCM extends SCM implements Serializable { return FormValidation.ok(); } - /** + /** * Validates the excludeRegions Regex */ public FormValidation doCheckExcludeRegions(@QueryParameter String value) { @@ -1576,6 +1581,7 @@ public class CVSSCM extends SCM implements Serializable { this.tagSet = tagSet; } + @Override public synchronized void start() { for (Entry e : tagSet.entrySet()) { TagAction ta = e.getKey().getAction(TagAction.class); diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java index 8a650e9945..0c0ecd94bf 100644 --- a/core/src/main/java/hudson/security/AuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java @@ -231,10 +231,12 @@ public abstract class AuthorizationStrategy implements Describable r : (Set>)formData.getJSONObject("data").entrySet()) { diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java index 159a34b7f0..0c753d945f 100644 --- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java +++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java @@ -436,6 +436,7 @@ public class HudsonPrivateSecurityRealm extends SecurityRealm implements ModelOb return Details.fromPlainPassword(Util.fixNull(pwd)); } + @Override public boolean isEnabled() { return Hudson.getInstance().getSecurityRealm() instanceof HudsonPrivateSecurityRealm; } @@ -544,6 +545,7 @@ public class HudsonPrivateSecurityRealm extends SecurityRealm implements ModelOb return Messages.HudsonPrivateSecurityRealm_DisplayName(); } + @Override public String getHelpFile() { return "/help/security/private-realm.html"; } diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java index e8e545f00f..c60a8a43c7 100644 --- a/core/src/main/java/hudson/security/SecurityRealm.java +++ b/core/src/main/java/hudson/security/SecurityRealm.java @@ -391,6 +391,7 @@ public abstract class SecurityRealm implements Describable, Exten * This special instance is not configurable explicitly, * so it doesn't have a descriptor. */ + @Override public Descriptor getDescriptor() { return null; } diff --git a/core/src/main/java/hudson/slaves/Channels.java b/core/src/main/java/hudson/slaves/Channels.java index c913a86afc..3dfae505eb 100644 --- a/core/src/main/java/hudson/slaves/Channels.java +++ b/core/src/main/java/hudson/slaves/Channels.java @@ -72,6 +72,7 @@ public class Channels { /** * Kill the process when the channel is severed. */ + @Override protected synchronized void terminate(IOException e) { super.terminate(e); try { @@ -85,6 +86,7 @@ public class Channels { } } + @Override public synchronized void close() throws IOException { super.close(); // wait for Maven to complete @@ -106,12 +108,14 @@ public class Channels { /** * Kill the process when the channel is severed. */ + @Override protected synchronized void terminate(IOException e) { super.terminate(e); proc.destroy(); // the stderr copier should exit by itself } + @Override public synchronized void close() throws IOException { super.close(); // wait for Maven to complete diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java index 265af6f469..da85217076 100644 --- a/core/src/main/java/hudson/slaves/SlaveComputer.java +++ b/core/src/main/java/hudson/slaves/SlaveComputer.java @@ -131,6 +131,7 @@ public class SlaveComputer extends Computer { return isUnix; } + @Override public Slave getNode() { return (Slave)super.getNode(); } @@ -283,6 +284,7 @@ public class SlaveComputer extends Computer { Channel channel = new Channel(nodeName,threadPoolForRemoting, Channel.Mode.NEGOTIATE, in,out, launchLog); channel.addListener(new Channel.Listener() { + @Override public void onClosed(Channel c,IOException cause) { SlaveComputer.this.channel = null; offlineCause = new ChannelTermination(cause); diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java index c2cbb15521..bbb92d2ee6 100644 --- a/core/src/main/java/hudson/tasks/Ant.java +++ b/core/src/main/java/hudson/tasks/Ant.java @@ -235,6 +235,7 @@ public class Ant extends Builder { return base.child("build.xml"); } + @Override public DescriptorImpl getDescriptor() { return (DescriptorImpl)super.getDescriptor(); } @@ -268,6 +269,7 @@ public class Ant extends Builder { installations = (AntInstallation[]) oldPropertyBag.get("installations"); } + @Override public String getHelpFile() { return "/help/project-config/ant.html"; } @@ -280,6 +282,7 @@ public class Ant extends Builder { return installations; } + @Override public Ant newInstance(StaplerRequest req, JSONObject formData) throws FormException { return (Ant)req.bindJSON(clazz,formData); } diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java index d5d05b0016..cb64dddebd 100644 --- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java +++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java @@ -95,6 +95,7 @@ public class ArtifactArchiver extends Recorder { } } + @Override public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException { if(artifacts.length()==0) { listener.error(Messages.ArtifactArchiver_NoIncludes()); @@ -137,7 +138,8 @@ public class ArtifactArchiver extends Recorder { return true; } - public @Override boolean prebuild(AbstractBuild build, BuildListener listener) { + @Override + public boolean prebuild(AbstractBuild build, BuildListener listener) { if(latestOnly) { AbstractBuild b = build.getProject().getLastCompletedBuild(); Result bestResultSoFar = Result.NOT_BUILT; @@ -190,6 +192,7 @@ public class ArtifactArchiver extends Recorder { return FilePath.validateFileMask(project.getSomeWorkspace(),value); } + @Override public ArtifactArchiver newInstance(StaplerRequest req, JSONObject formData) throws FormException { return req.bindJSON(ArtifactArchiver.class,formData); } diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java index 95e519dfb0..1fd20c4ebc 100644 --- a/core/src/main/java/hudson/tasks/Fingerprinter.java +++ b/core/src/main/java/hudson/tasks/Fingerprinter.java @@ -203,6 +203,7 @@ public class Fingerprinter extends Recorder implements Serializable { return Messages.Fingerprinter_DisplayName(); } + @Override public String getHelpFile() { return "/help/project-config/fingerprint.html"; } @@ -214,6 +215,7 @@ public class Fingerprinter extends Recorder implements Serializable { return FilePath.validateFileMask(project.getSomeWorkspace(),value); } + @Override public Publisher newInstance(StaplerRequest req) { return new Fingerprinter( req.getParameter("fingerprint_targets").trim(), diff --git a/core/src/main/java/hudson/tasks/Mailer.java b/core/src/main/java/hudson/tasks/Mailer.java index 41c1e29ab4..f72a03a25b 100644 --- a/core/src/main/java/hudson/tasks/Mailer.java +++ b/core/src/main/java/hudson/tasks/Mailer.java @@ -190,6 +190,7 @@ public class Mailer extends Notifier { /** * For backward compatibility. */ + @Override protected void convert(Map oldPropertyBag) { defaultSuffix = (String)oldPropertyBag.get("mail.default.suffix"); hudsonUrl = (String)oldPropertyBag.get("mail.hudson.url"); @@ -203,6 +204,7 @@ public class Mailer extends Notifier { return Messages.Mailer_DisplayName(); } + @Override public String getHelpFile() { return "/help/project-config/mailer.html"; } @@ -250,6 +252,7 @@ public class Mailer extends Notifier { final String un = getSmtpAuthUserName(); if(un==null) return null; return new Authenticator() { + @Override protected PasswordAuthentication getPasswordAuthentication() { return new PasswordAuthentication(getSmtpAuthUserName(),getSmtpAuthPassword()); } @@ -344,6 +347,7 @@ public class Mailer extends Notifier { this.smtpPort = smtpPort; } + @Override public Publisher newInstance(StaplerRequest req) { Mailer m = new Mailer(); req.bindParameters(m,"mailer_"); @@ -448,10 +452,10 @@ public class Mailer extends Notifier { } public UserProperty newInstance(User user) { - return new UserProperty(null); } + @Override public UserProperty newInstance(StaplerRequest req) throws FormException { return new UserProperty(req.getParameter("email.address")); } diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index f6d3e4666d..c1cf35d3b3 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -311,11 +311,13 @@ public class Maven extends Builder { return true; } + @Override protected void convert(Map oldPropertyBag) { if(oldPropertyBag.containsKey("installations")) installations = (MavenInstallation[]) oldPropertyBag.get("installations"); } + @Override public String getHelpFile() { return "/help/project-config/maven.html"; } diff --git a/core/src/main/java/hudson/tasks/Publisher.java b/core/src/main/java/hudson/tasks/Publisher.java index 569855192b..a841d10cbe 100644 --- a/core/src/main/java/hudson/tasks/Publisher.java +++ b/core/src/main/java/hudson/tasks/Publisher.java @@ -67,6 +67,7 @@ public abstract class Publisher extends BuildStepCompatibilityLayer implements B * Don't extend from {@link Publisher} directly. Instead, choose {@link Recorder} or {@link Notifier} * as your base class. */ + @Deprecated protected Publisher() { } @@ -92,7 +93,7 @@ public abstract class Publisher extends BuildStepCompatibilityLayer implements B } /** - * Returne true if this {@link Publisher} needs to run after the build result is + * Return true if this {@link Publisher} needs to run after the build result is * fully finalized. * *

diff --git a/core/src/main/java/hudson/tasks/UserNameResolver.java b/core/src/main/java/hudson/tasks/UserNameResolver.java index 50f9f2a995..c96b1d7c2e 100644 --- a/core/src/main/java/hudson/tasks/UserNameResolver.java +++ b/core/src/main/java/hudson/tasks/UserNameResolver.java @@ -51,7 +51,7 @@ import java.util.List; */ public abstract class UserNameResolver implements ExtensionPoint { - /** + /** * Finds full name of the given user. * *

diff --git a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java index c1f59f91a8..54229602a8 100644 --- a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java +++ b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java @@ -74,17 +74,17 @@ import org.kohsuke.stapler.StaplerRequest; public class JUnitResultArchiver extends Recorder implements Serializable, MatrixAggregatable { - /** - * {@link FileSet} "includes" string, like "foo/bar/*.xml" - */ - private final String testResults; + /** + * {@link FileSet} "includes" string, like "foo/bar/*.xml" + */ + private final String testResults; /** * {@link TestDataPublisher}s configured for this archiver, to process the recorded data. * For compatibility reasons, can be null. * @since 1.320 */ - private final DescribableList> testDataPublishers; + private final DescribableList> testDataPublishers; /** * left for backwards compatibility @@ -230,15 +230,16 @@ public class JUnitResultArchiver extends Recorder implements Serializable, } } - @Extension - public static class DescriptorImpl extends BuildStepDescriptor { + @Extension + public static class DescriptorImpl extends BuildStepDescriptor { public String getDisplayName() { return Messages.JUnitResultArchiver_DisplayName(); } - public String getHelpFile() { - return "/help/tasks/junit/report.html"; - } + @Override + public String getHelpFile() { + return "/help/tasks/junit/report.html"; + } @Override public Publisher newInstance(StaplerRequest req, JSONObject formData) @@ -267,5 +268,5 @@ public class JUnitResultArchiver extends Recorder implements Serializable, public boolean isApplicable(Class jobType) { return true; } - } + } } diff --git a/core/src/main/java/hudson/util/ChartUtil.java b/core/src/main/java/hudson/util/ChartUtil.java index 914e4e0582..e328cc5aef 100644 --- a/core/src/main/java/hudson/util/ChartUtil.java +++ b/core/src/main/java/hudson/util/ChartUtil.java @@ -57,16 +57,19 @@ public class ChartUtil { return this.build.number-that.build.number; } + @Override public boolean equals(Object o) { if(!(o instanceof NumberOnlyBuildLabel)) return false; NumberOnlyBuildLabel that = (NumberOnlyBuildLabel) o; return build==that.build; } + @Override public int hashCode() { return build.hashCode(); } + @Override public String toString() { return build.getDisplayName(); }