You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2014/07/04 09:17:54 UTC
[12/17] checkstyle
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/Manifest.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
index 9849983..9fa576f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -166,7 +166,8 @@ public class Manifest {
* @see java.lang.Object#hashCode
* @return a hashcode based on the key and values.
*/
- public int hashCode() {
+ @Override
+ public int hashCode() {
int hashCode = 0;
if (name != null) {
@@ -182,7 +183,8 @@ public class Manifest {
* @see java.lang.Object#equals
* @return true if the key and values are the same.
*/
- public boolean equals(Object rhs) {
+ @Override
+ public boolean equals(Object rhs) {
if (rhs == null || rhs.getClass() != getClass()) {
return false;
}
@@ -312,7 +314,7 @@ public class Manifest {
* @param line the continuation line.
*/
public void addContinuation(String line) {
- String currentValue = (String) values.elementAt(currentIndex);
+ String currentValue = values.elementAt(currentIndex);
setValue(currentValue + line.substring(1));
}
@@ -535,7 +537,7 @@ public class Manifest {
Attribute currentCp = getAttribute(ATTRIBUTE_CLASSPATH);
if (currentCp != null) {
for (Enumeration<String> attribEnum = currentCp.getValues();
- attribEnum.hasMoreElements(); ) {
+ attribEnum.hasMoreElements();) {
String value = attribEnum.nextElement();
classpathAttribute.addValue(value);
}
@@ -598,7 +600,7 @@ public class Manifest {
* instances.
*/
public Attribute getAttribute(String attributeName) {
- return (Attribute) attributes.get(attributeName.toLowerCase(Locale.ENGLISH));
+ return attributes.get(attributeName.toLowerCase(Locale.ENGLISH));
}
/**
@@ -686,7 +688,7 @@ public class Manifest {
// classpath attributes go into a vector
if (attributeKey.equals(ATTRIBUTE_CLASSPATH_LC)) {
Attribute classpathAttribute =
- (Attribute) attributes.get(attributeKey);
+ attributes.get(attributeKey);
if (classpathAttribute == null) {
storeAttribute(attribute);
@@ -718,7 +720,8 @@ public class Manifest {
* @return the cloned Section
* @since Ant 1.5.2
*/
- public Object clone() {
+ @Override
+ public Object clone() {
Section cloned = new Section();
cloned.setName(name);
Enumeration<String> e = getAttributeKeys();
@@ -757,7 +760,8 @@ public class Manifest {
* @see java.lang.Object#hashCode
* @return a hash value based on the attributes.
*/
- public int hashCode() {
+ @Override
+ public int hashCode() {
return attributes.hashCode();
}
@@ -766,7 +770,8 @@ public class Manifest {
* @param rhs the object to check for equality.
* @return true if the attributes are the same.
*/
- public boolean equals(Object rhs) {
+ @Override
+ public boolean equals(Object rhs) {
if (rhs == null || rhs.getClass() != getClass()) {
return false;
}
@@ -1055,7 +1060,8 @@ public class Manifest {
* @return a multiline string with the Manifest as it
* appears in a Manifest file.
*/
- public String toString() {
+ @Override
+ public String toString() {
StringWriter sw = new StringWriter();
try {
write(new PrintWriter(sw));
@@ -1093,7 +1099,8 @@ public class Manifest {
* @see java.lang.Object#hashCode
* @return a hashcode based on the version, main and sections.
*/
- public int hashCode() {
+ @Override
+ public int hashCode() {
int hashCode = 0;
if (manifestVersion != null) {
@@ -1110,7 +1117,8 @@ public class Manifest {
* @param rhs the object to check for equality.
* @return true if the version, main and sections are the same.
*/
- public boolean equals(Object rhs) {
+ @Override
+ public boolean equals(Object rhs) {
if (rhs == null || rhs.getClass() != getClass()) {
return false;
}
@@ -1161,7 +1169,7 @@ public class Manifest {
* does not exist in the manifest
*/
public Section getSection(String name) {
- return (Section) sections.get(name);
+ return sections.get(name);
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
index 0bac304..cf1f389 100644
--- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
@@ -168,7 +168,8 @@ public class PathConvert extends Task {
/**
* @return the list of values for this enumerated attribute.
*/
- public String[] getValues() {
+ @Override
+ public String[] getValues() {
return new String[]{"windows", "unix", "netware", "os/2", "tandem"};
}
}
@@ -225,7 +226,8 @@ public class PathConvert extends Task {
* Use the method taking a TargetOs argument instead.
* @see #setTargetos(PathConvert.TargetOs)
*/
- public void setTargetos(String target) {
+ @Deprecated
+ public void setTargetos(String target) {
TargetOs to = new TargetOs();
to.setValue(target);
setTargetos(to);
@@ -331,7 +333,8 @@ public class PathConvert extends Task {
* Do the execution.
* @throws BuildException if something is invalid.
*/
- public void execute() throws BuildException {
+ @Override
+ public void execute() throws BuildException {
Resources savedPath = path;
String savedPathSep = pathSep; // may be altered in validateSetup
String savedDirSep = dirSep; // may be altered in validateSetup
@@ -370,7 +373,7 @@ public class PathConvert extends Task {
}
}
boolean first = true;
- for (Iterator mappedIter = ret.iterator(); mappedIter.hasNext(); ) {
+ for (Iterator mappedIter = ret.iterator(); mappedIter.hasNext();) {
String elem = mapElement((String) mappedIter.next()); // Apply the path prefix map
// Now convert the path and file separator characters from the
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java b/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java
index 6d222ef..66580e4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java
@@ -28,7 +28,7 @@ import org.apache.tools.ant.Task;
/**
* Task to install project helper into Ant's runtime
- *
+ *
* @since Ant 1.8.2
*/
public class ProjectHelperTask extends Task {
@@ -39,7 +39,8 @@ public class ProjectHelperTask extends Task {
this.projectHelpers.add(projectHelper);
}
- public void execute() throws BuildException {
+ @Override
+ public void execute() throws BuildException {
ProjectHelperRepository repo = ProjectHelperRepository.getInstance();
for (Iterator it = projectHelpers.iterator(); it.hasNext();) {
ProjectHelper helper = (ProjectHelper) it.next();
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/Property.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java
index 4c8d2eb..eca3bd3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Property.java
@@ -431,7 +431,8 @@ public class Property extends Task {
* deprecated without replacement.
* @ant.attribute ignore="true"
*/
- public void setUserProperty(boolean userProperty) {
+ @Deprecated
+ public void setUserProperty(boolean userProperty) {
log("DEPRECATED: Ignoring request to set user property in Property"
+ " task.", Project.MSG_WARN);
}
@@ -440,7 +441,8 @@ public class Property extends Task {
* get the value of this property
* @return the current value or the empty string
*/
- public String toString() {
+ @Override
+ public String toString() {
return value == null ? "" : value;
}
@@ -450,7 +452,8 @@ public class Property extends Task {
* here is where it is loaded
* @throws BuildException on error
*/
- public void execute() throws BuildException {
+ @Override
+ public void execute() throws BuildException {
if (getProject() == null) {
throw new IllegalStateException("project has not been set");
}
@@ -520,7 +523,7 @@ public class Property extends Task {
}
}
}
-
+
/**
* load properties from a url
* @param url url to load from
@@ -651,7 +654,7 @@ public class Property extends Task {
}
log("Loading Environment " + prefix, Project.MSG_VERBOSE);
Map osEnv = Execute.getEnvironmentVariables();
- for (Iterator e = osEnv.entrySet().iterator(); e.hasNext(); ) {
+ for (Iterator e = osEnv.entrySet().iterator(); e.hasNext();) {
Map.Entry entry = (Map.Entry) e.next();
props.put(prefix + entry.getKey(), entry.getValue());
}
@@ -712,7 +715,7 @@ public class Property extends Task {
*/
private void resolveAllProperties(Map props) throws BuildException {
PropertyHelper propertyHelper
- = (PropertyHelper) PropertyHelper.getPropertyHelper(getProject());
+ = PropertyHelper.getPropertyHelper(getProject());
new ResolvePropertyMap(
getProject(),
propertyHelper,
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/Redirector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Redirector.java b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
index 23a847a..3735b70 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
@@ -61,16 +61,17 @@ public class Redirector {
.getProperty("file.encoding");
private class PropertyOutputStream extends ByteArrayOutputStream {
- private String property;
+ private final String property;
private boolean closed = false;
- PropertyOutputStream(String property) {
+ PropertyOutputStream(final String property) {
super();
this.property = property;
}
- public void close() throws IOException {
+ @Override
+ public void close() throws IOException {
synchronized (outMutex) {
if (!closed && !(appendOut && appendProperties)) {
setPropertyFromBAOS(this, property);
@@ -139,7 +140,7 @@ public class Redirector {
private boolean createEmptyFilesErr = true;
/** The task for which this redirector is working */
- private ProjectComponent managingTask;
+ private final ProjectComponent managingTask;
/** The stream for output data */
private OutputStream outputStream = null;
@@ -184,13 +185,13 @@ public class Redirector {
private boolean logInputString = true;
/** Mutex for in */
- private Object inMutex = new Object();
+ private final Object inMutex = new Object();
/** Mutex for out */
- private Object outMutex = new Object();
+ private final Object outMutex = new Object();
/** Mutex for err */
- private Object errMutex = new Object();
+ private final Object errMutex = new Object();
/** Is the output binary or can we safely split it into lines? */
private boolean outputIsBinary = false;
@@ -201,7 +202,7 @@ public class Redirector {
* @param managingTask
* the task for which the redirector is to work
*/
- public Redirector(Task managingTask) {
+ public Redirector(final Task managingTask) {
this((ProjectComponent) managingTask);
}
@@ -212,7 +213,7 @@ public class Redirector {
* the project component for which the redirector is to work
* @since Ant 1.6.3
*/
- public Redirector(ProjectComponent managingTask) {
+ public Redirector(final ProjectComponent managingTask) {
this.managingTask = managingTask;
}
@@ -222,8 +223,8 @@ public class Redirector {
* @param input
* the file from which input is read.
*/
- public void setInput(File input) {
- setInput((input == null) ? null : new File[] { input });
+ public void setInput(final File input) {
+ setInput((input == null) ? null : new File[] {input});
}
/**
@@ -232,12 +233,12 @@ public class Redirector {
* @param input
* the files from which input is read.
*/
- public void setInput(File[] input) {
+ public void setInput(final File[] input) {
synchronized (inMutex) {
if (input == null) {
this.input = null;
} else {
- this.input = (File[]) input.clone();
+ this.input = input.clone();
}
}
}
@@ -248,7 +249,7 @@ public class Redirector {
* @param inputString
* the string which is used as the input source
*/
- public void setInputString(String inputString) {
+ public void setInputString(final String inputString) {
synchronized (inMutex) {
this.inputString = inputString;
}
@@ -262,7 +263,7 @@ public class Redirector {
* true or false.
* @since Ant 1.7
*/
- public void setLogInputString(boolean logInputString) {
+ public void setLogInputString(final boolean logInputString) {
this.logInputString = logInputString;
}
@@ -273,7 +274,7 @@ public class Redirector {
* the stream from which input will be read
* @since Ant 1.6.3
*/
- /* public */void setInputStream(InputStream inputStream) {
+ /* public */void setInputStream(final InputStream inputStream) {
synchronized (inMutex) {
this.inputStream = inputStream;
}
@@ -286,8 +287,8 @@ public class Redirector {
* @param out
* the file to which output stream is written
*/
- public void setOutput(File out) {
- setOutput((out == null) ? null : new File[] { out });
+ public void setOutput(final File out) {
+ setOutput((out == null) ? null : new File[] {out});
}
/**
@@ -297,12 +298,12 @@ public class Redirector {
* @param out
* the files to which output stream is written
*/
- public void setOutput(File[] out) {
+ public void setOutput(final File[] out) {
synchronized (outMutex) {
if (out == null) {
this.out = null;
} else {
- this.out = (File[]) out.clone();
+ this.out = out.clone();
}
}
}
@@ -313,7 +314,7 @@ public class Redirector {
* @param outputEncoding
* <code>String</code>.
*/
- public void setOutputEncoding(String outputEncoding) {
+ public void setOutputEncoding(final String outputEncoding) {
if (outputEncoding == null) {
throw new IllegalArgumentException(
"outputEncoding must not be null");
@@ -329,7 +330,7 @@ public class Redirector {
* @param errorEncoding
* <code>String</code>.
*/
- public void setErrorEncoding(String errorEncoding) {
+ public void setErrorEncoding(final String errorEncoding) {
if (errorEncoding == null) {
throw new IllegalArgumentException("errorEncoding must not be null");
}
@@ -344,7 +345,7 @@ public class Redirector {
* @param inputEncoding
* <code>String</code>.
*/
- public void setInputEncoding(String inputEncoding) {
+ public void setInputEncoding(final String inputEncoding) {
if (inputEncoding == null) {
throw new IllegalArgumentException("inputEncoding must not be null");
}
@@ -361,7 +362,7 @@ public class Redirector {
* if true the standard error is sent to the Ant log system and
* not sent to output.
*/
- public void setLogError(boolean logError) {
+ public void setLogError(final boolean logError) {
synchronized (errMutex) {
this.logError = logError;
}
@@ -375,7 +376,7 @@ public class Redirector {
* @param appendProperties
* whether to append properties.
*/
- public void setAppendProperties(boolean appendProperties) {
+ public void setAppendProperties(final boolean appendProperties) {
synchronized (outMutex) {
this.appendProperties = appendProperties;
}
@@ -387,8 +388,8 @@ public class Redirector {
* @param error
* the file to which error is to be written
*/
- public void setError(File error) {
- setError((error == null) ? null : new File[] { error });
+ public void setError(final File error) {
+ setError((error == null) ? null : new File[] {error});
}
/**
@@ -397,12 +398,12 @@ public class Redirector {
* @param error
* the file to which error is to be written
*/
- public void setError(File[] error) {
+ public void setError(final File[] error) {
synchronized (errMutex) {
if (error == null) {
this.error = null;
} else {
- this.error = (File[]) error.clone();
+ this.error = error.clone();
}
}
}
@@ -413,7 +414,7 @@ public class Redirector {
* @param outputProperty
* the name of the property to be set with the task's output.
*/
- public void setOutputProperty(String outputProperty) {
+ public void setOutputProperty(final String outputProperty) {
if (outputProperty == null
|| !(outputProperty.equals(this.outputProperty))) {
synchronized (outMutex) {
@@ -431,7 +432,7 @@ public class Redirector {
* if true output and error streams are appended to their
* respective files, if specified.
*/
- public void setAppend(boolean append) {
+ public void setAppend(final boolean append) {
synchronized (outMutex) {
appendOut = append;
}
@@ -449,7 +450,7 @@ public class Redirector {
* <code>boolean</code>
* @since Ant 1.6.3
*/
- public void setAlwaysLog(boolean alwaysLog) {
+ public void setAlwaysLog(final boolean alwaysLog) {
synchronized (outMutex) {
alwaysLogOut = alwaysLog;
}
@@ -465,7 +466,7 @@ public class Redirector {
* @param createEmptyFiles
* <code>boolean</code>.
*/
- public void setCreateEmptyFiles(boolean createEmptyFiles) {
+ public void setCreateEmptyFiles(final boolean createEmptyFiles) {
synchronized (outMutex) {
createEmptyFilesOut = createEmptyFiles;
}
@@ -480,7 +481,7 @@ public class Redirector {
* @param errorProperty
* the name of the property to be set with the error output.
*/
- public void setErrorProperty(String errorProperty) {
+ public void setErrorProperty(final String errorProperty) {
synchronized (errMutex) {
if (errorProperty == null
|| !(errorProperty.equals(this.errorProperty))) {
@@ -496,7 +497,7 @@ public class Redirector {
* @param inputFilterChains
* <code>Vector</code> containing <code>FilterChain</code>.
*/
- public void setInputFilterChains(Vector<FilterChain> inputFilterChains) {
+ public void setInputFilterChains(final Vector<FilterChain> inputFilterChains) {
synchronized (inMutex) {
this.inputFilterChains = inputFilterChains;
}
@@ -508,7 +509,7 @@ public class Redirector {
* @param outputFilterChains
* <code>Vector</code> containing <code>FilterChain</code>.
*/
- public void setOutputFilterChains(Vector<FilterChain> outputFilterChains) {
+ public void setOutputFilterChains(final Vector<FilterChain> outputFilterChains) {
synchronized (outMutex) {
this.outputFilterChains = outputFilterChains;
}
@@ -520,7 +521,7 @@ public class Redirector {
* @param errorFilterChains
* <code>Vector</code> containing <code>FilterChain</code>.
*/
- public void setErrorFilterChains(Vector<FilterChain> errorFilterChains) {
+ public void setErrorFilterChains(final Vector<FilterChain> errorFilterChains) {
synchronized (errMutex) {
this.errorFilterChains = errorFilterChains;
}
@@ -534,7 +535,7 @@ public class Redirector {
* the same stream.</p>
* @since 1.9.4
*/
- public void setBinaryOutput(boolean b) {
+ public void setBinaryOutput(final boolean b) {
outputIsBinary = b;
}
@@ -549,13 +550,13 @@ public class Redirector {
* @exception IOException
* if the value cannot be read form the stream.
*/
- private void setPropertyFromBAOS(ByteArrayOutputStream baos,
- String propertyName) throws IOException {
+ private void setPropertyFromBAOS(final ByteArrayOutputStream baos,
+ final String propertyName) throws IOException {
- BufferedReader in = new BufferedReader(new StringReader(Execute
+ final BufferedReader in = new BufferedReader(new StringReader(Execute
.toString(baos)));
String line = null;
- StringBuffer val = new StringBuffer();
+ final StringBuffer val = new StringBuffer();
while ((line = in.readLine()) != null) {
if (val.length() != 0) {
val.append(StringUtils.LINE_SEP);
@@ -574,7 +575,7 @@ public class Redirector {
synchronized (outMutex) {
outStreams();
if (alwaysLogOut || outputStream == null) {
- OutputStream outputLog = new LogOutputStream(managingTask,
+ final OutputStream outputLog = new LogOutputStream(managingTask,
Project.MSG_INFO);
outputStream = (outputStream == null) ? outputLog
: new TeeOutputStream(outputLog, outputStream);
@@ -583,7 +584,7 @@ public class Redirector {
if ((outputFilterChains != null && outputFilterChains.size() > 0)
|| !(outputEncoding.equalsIgnoreCase(inputEncoding))) {
try {
- LeadPipeInputStream snk = new LeadPipeInputStream();
+ final LeadPipeInputStream snk = new LeadPipeInputStream();
snk.setManagingComponent(managingTask);
InputStream outPumpIn = snk;
@@ -593,7 +594,7 @@ public class Redirector {
if (outputFilterChains != null
&& outputFilterChains.size() > 0) {
- ChainReaderHelper helper = new ChainReaderHelper();
+ final ChainReaderHelper helper = new ChainReaderHelper();
helper.setProject(managingTask.getProject());
helper.setPrimaryReader(reader);
helper.setFilterChains(outputFilterChains);
@@ -601,12 +602,12 @@ public class Redirector {
}
outPumpIn = new ReaderInputStream(reader, outputEncoding);
- Thread t = new Thread(threadGroup, new StreamPumper(
+ final Thread t = new Thread(threadGroup, new StreamPumper(
outPumpIn, outputStream, true), "output pumper");
t.setPriority(Thread.MAX_PRIORITY);
outputStream = new PipedOutputStream(snk);
t.start();
- } catch (IOException eyeOhEx) {
+ } catch (final IOException eyeOhEx) {
throw new BuildException("error setting up output stream",
eyeOhEx);
}
@@ -616,7 +617,7 @@ public class Redirector {
synchronized (errMutex) {
errorStreams();
if (alwaysLogErr || errorStream == null) {
- OutputStream errorLog = new LogOutputStream(managingTask,
+ final OutputStream errorLog = new LogOutputStream(managingTask,
Project.MSG_WARN);
errorStream = (errorStream == null) ? errorLog
: new TeeOutputStream(errorLog, errorStream);
@@ -625,7 +626,7 @@ public class Redirector {
if ((errorFilterChains != null && errorFilterChains.size() > 0)
|| !(errorEncoding.equalsIgnoreCase(inputEncoding))) {
try {
- LeadPipeInputStream snk = new LeadPipeInputStream();
+ final LeadPipeInputStream snk = new LeadPipeInputStream();
snk.setManagingComponent(managingTask);
InputStream errPumpIn = snk;
@@ -635,7 +636,7 @@ public class Redirector {
if (errorFilterChains != null
&& errorFilterChains.size() > 0) {
- ChainReaderHelper helper = new ChainReaderHelper();
+ final ChainReaderHelper helper = new ChainReaderHelper();
helper.setProject(managingTask.getProject());
helper.setPrimaryReader(reader);
helper.setFilterChains(errorFilterChains);
@@ -643,12 +644,12 @@ public class Redirector {
}
errPumpIn = new ReaderInputStream(reader, errorEncoding);
- Thread t = new Thread(threadGroup, new StreamPumper(
+ final Thread t = new Thread(threadGroup, new StreamPumper(
errPumpIn, errorStream, true), "error pumper");
t.setPriority(Thread.MAX_PRIORITY);
errorStream = new PipedOutputStream(snk);
t.start();
- } catch (IOException eyeOhEx) {
+ } catch (final IOException eyeOhEx) {
throw new BuildException("error setting up error stream",
eyeOhEx);
}
@@ -667,13 +668,13 @@ public class Redirector {
Project.MSG_VERBOSE);
try {
inputStream = new ConcatFileInputStream(input);
- } catch (IOException eyeOhEx) {
+ } catch (final IOException eyeOhEx) {
throw new BuildException(eyeOhEx);
}
((ConcatFileInputStream) inputStream)
.setManagingComponent(managingTask);
} else if (inputString != null) {
- StringBuffer buf = new StringBuffer("Using input ");
+ final StringBuffer buf = new StringBuffer("Using input ");
if (logInputString) {
buf.append('"').append(inputString).append('"');
} else {
@@ -685,12 +686,12 @@ public class Redirector {
if (inputStream != null && inputFilterChains != null
&& inputFilterChains.size() > 0) {
- ChainReaderHelper helper = new ChainReaderHelper();
+ final ChainReaderHelper helper = new ChainReaderHelper();
helper.setProject(managingTask.getProject());
try {
helper.setPrimaryReader(new InputStreamReader(inputStream,
inputEncoding));
- } catch (IOException eyeOhEx) {
+ } catch (final IOException eyeOhEx) {
throw new BuildException("error setting up input stream",
eyeOhEx);
}
@@ -704,7 +705,7 @@ public class Redirector {
/** outStreams */
private void outStreams() {
if (out != null && out.length > 0) {
- String logHead = new StringBuffer("Output ").append(
+ final String logHead = new StringBuffer("Output ").append(
((appendOut) ? "appended" : "redirected")).append(" to ")
.toString();
outputStream = foldFiles(out, logHead, Project.MSG_VERBOSE,
@@ -717,7 +718,7 @@ public class Redirector {
+ outputProperty, Project.MSG_VERBOSE);
}
// shield it from being closed by a filtering StreamPumper
- OutputStream keepAliveOutput = new KeepAliveOutputStream(baos);
+ final OutputStream keepAliveOutput = new KeepAliveOutputStream(baos);
outputStream = (outputStream == null) ? keepAliveOutput
: new TeeOutputStream(outputStream, keepAliveOutput);
} else {
@@ -727,14 +728,14 @@ public class Redirector {
private void errorStreams() {
if (error != null && error.length > 0) {
- String logHead = new StringBuffer("Error ").append(
+ final String logHead = new StringBuffer("Error ").append(
((appendErr) ? "appended" : "redirected")).append(" to ")
.toString();
errorStream = foldFiles(error, logHead, Project.MSG_VERBOSE,
appendErr, createEmptyFilesErr);
} else if (!(logError || outputStream == null) && errorProperty == null) {
- long funnelTimeout = 0L;
- OutputStreamFunneler funneler = new OutputStreamFunneler(
+ final long funnelTimeout = 0L;
+ final OutputStreamFunneler funneler = new OutputStreamFunneler(
outputStream, funnelTimeout);
try {
outputStream = funneler.getFunnelInstance();
@@ -743,7 +744,7 @@ public class Redirector {
outputStream = new LineOrientedOutputStreamRedirector(outputStream);
errorStream = new LineOrientedOutputStreamRedirector(errorStream);
}
- } catch (IOException eyeOhEx) {
+ } catch (final IOException eyeOhEx) {
throw new BuildException(
"error splitting output/error streams", eyeOhEx);
}
@@ -755,7 +756,7 @@ public class Redirector {
+ errorProperty, Project.MSG_VERBOSE);
}
// shield it from being closed by a filtering StreamPumper
- OutputStream keepAliveError = new KeepAliveOutputStream(errorBaos);
+ final OutputStream keepAliveError = new KeepAliveOutputStream(errorBaos);
errorStream = (error == null || error.length == 0) ? keepAliveError
: new TeeOutputStream(errorStream, keepAliveError);
} else {
@@ -774,7 +775,7 @@ public class Redirector {
*/
public ExecuteStreamHandler createHandler() throws BuildException {
createStreams();
- boolean nonBlockingRead = input == null && inputString == null;
+ final boolean nonBlockingRead = input == null && inputString == null;
return new PumpStreamHandler(getOutputStream(), getErrorStream(),
getInputStream(), nonBlockingRead);
}
@@ -785,7 +786,7 @@ public class Redirector {
* @param output
* the data to be output
*/
- protected void handleOutput(String output) {
+ protected void handleOutput(final String output) {
synchronized (outMutex) {
if (outPrintStream == null) {
outPrintStream = new PrintStream(outputStream);
@@ -809,7 +810,7 @@ public class Redirector {
* @exception IOException
* if the data cannot be read
*/
- protected int handleInput(byte[] buffer, int offset, int length)
+ protected int handleInput(final byte[] buffer, final int offset, final int length)
throws IOException {
synchronized (inMutex) {
if (inputStream == null) {
@@ -827,7 +828,7 @@ public class Redirector {
* @param output
* the data being flushed.
*/
- protected void handleFlush(String output) {
+ protected void handleFlush(final String output) {
synchronized (outMutex) {
if (outPrintStream == null) {
outPrintStream = new PrintStream(outputStream);
@@ -843,7 +844,7 @@ public class Redirector {
* @param output
* the error output data.
*/
- protected void handleErrorOutput(String output) {
+ protected void handleErrorOutput(final String output) {
synchronized (errMutex) {
if (errorPrintStream == null) {
errorPrintStream = new PrintStream(errorStream);
@@ -858,7 +859,7 @@ public class Redirector {
* @param output
* the error information being flushed.
*/
- protected void handleErrorFlush(String output) {
+ protected void handleErrorFlush(final String output) {
synchronized (errMutex) {
if (errorPrintStream == null) {
errorPrintStream = new PrintStream(errorStream);
@@ -940,19 +941,19 @@ public class Redirector {
try {
managingTask.log("waiting for " + threadGroup.activeCount()
+ " Threads:", Project.MSG_DEBUG);
- Thread[] thread = new Thread[threadGroup.activeCount()];
+ final Thread[] thread = new Thread[threadGroup.activeCount()];
threadGroup.enumerate(thread);
for (int i = 0; i < thread.length && thread[i] != null; i++) {
try {
managingTask.log(thread[i].toString(),
Project.MSG_DEBUG);
- } catch (NullPointerException enPeaEx) {
+ } catch (final NullPointerException enPeaEx) {
// Ignore exception
}
}
wait(STREAMPUMPER_WAIT_INTERVAL);
- } catch (InterruptedException eyeEx) {
- Thread[] thread = new Thread[threadGroup.activeCount()];
+ } catch (final InterruptedException eyeEx) {
+ final Thread[] thread = new Thread[threadGroup.activeCount()];
threadGroup.enumerate(thread);
for (int i = 0; i < thread.length && thread[i] != null; i++) {
thread[i].interrupt();
@@ -985,7 +986,7 @@ public class Redirector {
if (baos != null) {
try {
baos.close();
- } catch (IOException eyeOhEx) {
+ } catch (final IOException eyeOhEx) {
// Ignore exception
}
}
@@ -994,22 +995,22 @@ public class Redirector {
if (errorBaos != null) {
try {
errorBaos.close();
- } catch (IOException eyeOhEx) {
+ } catch (final IOException eyeOhEx) {
// Ignore exception
}
}
}
}
- private OutputStream foldFiles(File[] file, String logHead, int loglevel,
- boolean append, boolean createEmptyFiles) {
- OutputStream result = new LazyFileOutputStream(file[0], append,
+ private OutputStream foldFiles(final File[] file, final String logHead, final int loglevel,
+ final boolean append, final boolean createEmptyFiles) {
+ final OutputStream result = new LazyFileOutputStream(file[0], append,
createEmptyFiles);
managingTask.log(logHead + file[0], loglevel);
- char[] c = new char[logHead.length()];
+ final char[] c = new char[logHead.length()];
Arrays.fill(c, ' ');
- String indent = new String(c);
+ final String indent = new String(c);
for (int i = 1; i < file.length; i++) {
outputStream = new TeeOutputStream(outputStream,
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/Rmic.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index f17b47a..87dde5a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -39,14 +39,14 @@ import org.apache.tools.ant.util.facade.FacadeTaskHelper;
/**
* <p>Runs the rmic compiler against classes.</p>
- *
+ *
* <p>Rmic can be run on a single class (as specified with the classname
* attribute) or a number of classes at once (all classes below base that
* are neither _Stub nor _Skel classes). If you want to rmic a single
* class and this class is a class nested into another class, you have to
* specify the classname in the form <code>Outer$$Inner</code> instead of
* <code>Outer.Inner</code>.</p>
- *
+ *
* <p>It is possible to refine the set of files that are being rmiced. This can
* be done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>,
* <i>excludesfile</i> and <i>defaultexcludes</i>
@@ -58,17 +58,17 @@ import org.apache.tools.ant.util.facade.FacadeTaskHelper;
* you want to use default exclusions or not. See the section on
* directory based tasks, on how the
* inclusion/exclusion of files works, and how to write patterns.</p>
- *
+ *
* <p>This task forms an implicit FileSet and
* supports all attributes of <code><fileset></code>
* (<code>dir</code> becomes <code>base</code>) as well as the nested
* <code><include></code>, <code><exclude></code> and
* <code><patternset></code> elements.</p>
- *
+ *
* <p>It is possible to use different compilers. This can be selected
* with the "build.rmic" property or the <code>compiler</code>
* attribute. <a name="compilervalues">There are three choices</a>:</p>
- *
+ *
* <ul>
* <li>sun (the standard compiler of the JDK)</li>
* <li>kaffe (the standard compiler of
@@ -587,7 +587,8 @@ public class Rmic extends MatchingTask {
* @throws org.apache.tools.ant.BuildException
* if there's a problem with baseDir or RMIC
*/
- public void execute() throws BuildException {
+ @Override
+ public void execute() throws BuildException {
try {
compileList.clear();
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index 8638beb..874939b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -90,7 +90,8 @@ public class SQLExec extends JDBCTask {
/** The enumerated strings */
public static final String NORMAL = "normal", ROW = "row";
/** @return the enumerated strings */
- public String[] getValues() {
+ @Override
+ public String[] getValues() {
return new String[] {NORMAL, ROW};
}
}
@@ -589,7 +590,8 @@ public class SQLExec extends JDBCTask {
* Load the sql file and then execute it
* @throws BuildException on error.
*/
- public void execute() throws BuildException {
+ @Override
+ public void execute() throws BuildException {
Vector savedTransaction = (Vector) transactions.clone();
String savedSqlCommand = sqlCommand;
@@ -850,7 +852,8 @@ public class SQLExec extends JDBCTask {
* @param out the place to print results
* @throws SQLException on SQL problems.
*/
- protected void printResults(PrintStream out) throws SQLException {
+ @Deprecated
+ protected void printResults(PrintStream out) throws SQLException {
ResultSet rs = getStatement().getResultSet();
try {
printResults(rs, out);
@@ -954,7 +957,8 @@ public class SQLExec extends JDBCTask {
* <p>returns null if the connection does not connect to the
* expected RDBMS.</p>
*/
- protected Connection getConnection() {
+ @Override
+ protected Connection getConnection() {
if (conn == null) {
conn = super.getConnection();
if (!isValidRdbms(conn)) {
@@ -981,14 +985,15 @@ public class SQLExec extends JDBCTask {
return statement;
}
-
+
/**
* The action a task should perform on an error,
* one of "continue", "stop" and "abort"
*/
public static class OnError extends EnumeratedAttribute {
/** @return the enumerated values */
- public String[] getValues() {
+ @Override
+ public String[] getValues() {
return new String[] {"continue", "stop", "abort"};
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/SignJar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
index 66804de..7f9b1ee 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
@@ -321,7 +321,8 @@ public class SignJar extends AbstractJarSignerTask {
*
* @throws BuildException on errors
*/
- public void execute() throws BuildException {
+ @Override
+ public void execute() throws BuildException {
//validation logic
final boolean hasJar = jar != null;
final boolean hasSignedJar = signedjar != null;
@@ -514,7 +515,7 @@ public class SignJar extends AbstractJarSignerTask {
* is complex, and best explained in the source itself. Essentially if
* either file doesnt exist, or the destfile has an out of date timestamp,
* then the return value is false.</p>
- *
+ *
* <p>If we are signing ourself, the check {@link #isSigned(File)} is used to
* trigger the process.</p>
*
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/Sleep.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Sleep.java b/src/main/org/apache/tools/ant/taskdefs/Sleep.java
index 4e924f9..0fe27c5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Sleep.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Sleep.java
@@ -26,11 +26,11 @@ import org.apache.tools.ant.Task;
*
* <p>A task for sleeping a short period of time, useful when a
* build or deployment process requires an interval between tasks.</p>
- *
+ *
* <p>A negative value can be supplied to any of attributes provided the total sleep time
* is positive, pending fundamental changes in physics and JVM
* execution times</p>
- *
+ *
* <p>Note that sleep times are always hints to be interpreted by the OS how it feels
* small times may either be ignored or rounded up to a minimum timeslice. Note
* also that the system clocks often have a fairly low granularity too, which complicates
@@ -171,7 +171,8 @@ public class Sleep extends Task {
*
* @exception BuildException Description of Exception
*/
- public void execute()
+ @Override
+ public void execute()
throws BuildException {
try {
validate();
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
index 34b3f21..3751b02 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
@@ -84,7 +84,7 @@ public class SubAnt extends Task {
* <p>
* This function may be overrided by providers of custom ProjectHelper so they can implement easily their sub
* launcher.
- *
+ *
* @return the name of the default file
* @since Ant 1.8.0
*/
@@ -98,7 +98,8 @@ public class SubAnt extends Task {
* @param output a line of output
* @since Ant 1.6.2
*/
- public void handleOutput(String output) {
+ @Override
+ public void handleOutput(String output) {
if (ant != null) {
ant.handleOutput(output);
} else {
@@ -121,7 +122,8 @@ public class SubAnt extends Task {
*
* @since Ant 1.6.2
*/
- public int handleInput(byte[] buffer, int offset, int length)
+ @Override
+ public int handleInput(byte[] buffer, int offset, int length)
throws IOException {
if (ant != null) {
return ant.handleInput(buffer, offset, length);
@@ -137,7 +139,8 @@ public class SubAnt extends Task {
*
* @since Ant 1.6.2
*/
- public void handleFlush(String output) {
+ @Override
+ public void handleFlush(String output) {
if (ant != null) {
ant.handleFlush(output);
} else {
@@ -152,7 +155,8 @@ public class SubAnt extends Task {
*
* @since Ant 1.6.2
*/
- public void handleErrorOutput(String output) {
+ @Override
+ public void handleErrorOutput(String output) {
if (ant != null) {
ant.handleErrorOutput(output);
} else {
@@ -167,7 +171,8 @@ public class SubAnt extends Task {
*
* @since Ant 1.6.2
*/
- public void handleErrorFlush(String output) {
+ @Override
+ public void handleErrorFlush(String output) {
if (ant != null) {
ant.handleErrorFlush(output);
} else {
@@ -178,7 +183,8 @@ public class SubAnt extends Task {
/**
* Runs the various sub-builds.
*/
- public void execute() {
+ @Override
+ public void execute() {
if (buildpath == null) {
throw new BuildException("No buildpath specified");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/Sync.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Sync.java b/src/main/org/apache/tools/ant/taskdefs/Sync.java
index e269cf4..29982af 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Sync.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Sync.java
@@ -72,7 +72,8 @@ public class Sync extends Task {
* @throws BuildException if there is a problem.
* @see Task#init()
*/
- public void init()
+ @Override
+ public void init()
throws BuildException {
// Instantiate it
myCopy = new MyCopy();
@@ -97,7 +98,8 @@ public class Sync extends Task {
* @throws BuildException if there is an error.
* @see Task#execute()
*/
- public void execute()
+ @Override
+ public void execute()
throws BuildException {
// The destination of the files to copy
File toDir = myCopy.getToDir();
@@ -324,7 +326,7 @@ public class Sync extends Task {
private int removeEmptyDirectories(Set preservedEmptyDirectories) {
int removedCount = 0;
for (Iterator iter = preservedEmptyDirectories.iterator();
- iter.hasNext(); ) {
+ iter.hasNext();) {
File f = (File) iter.next();
String[] s = f.list();
if (s == null || s.length == 0) {
@@ -399,7 +401,7 @@ public class Sync extends Task {
myCopy.add(rc);
} else {
if (resources == null) {
- Restrict r = new Restrict();
+ Restrict r = new Restrict();
r.add(new Exists());
r.add(resources = new Resources());
myCopy.add(r);
@@ -464,7 +466,8 @@ public class Sync extends Task {
* @see Copy#scan(File, File, String[], String[])
*/
/** {@inheritDoc} */
- protected void scan(File fromDir, File toDir, String[] files,
+ @Override
+ protected void scan(File fromDir, File toDir, String[] files,
String[] dirs) {
assertTrue("No mapper", mapperElement == null);
@@ -482,7 +485,8 @@ public class Sync extends Task {
* @see Copy#scan(Resource[], File)
*/
/** {@inheritDoc} */
- protected Map scan(Resource[] resources, File toDir) {
+ @Override
+ protected Map scan(Resource[] resources, File toDir) {
assertTrue("No mapper", mapperElement == null);
for (int i = 0; i < resources.length; i++) {
@@ -512,7 +516,8 @@ public class Sync extends Task {
* @return true always.
* @since Ant 1.7
*/
- protected boolean supportsNonFileResources() {
+ @Override
+ protected boolean supportsNonFileResources() {
return true;
}
}
@@ -543,7 +548,8 @@ public class Sync extends Task {
* @param dir ignored
* @throws BuildException always
*/
- public void setDir(File dir) throws BuildException {
+ @Override
+ public void setDir(File dir) throws BuildException {
throw new BuildException("preserveintarget doesn't support the dir "
+ "attribute");
}
@@ -579,7 +585,7 @@ public class Sync extends Task {
PatternSet ps = mergePatterns(getProject());
fs.appendIncludes(ps.getIncludePatterns(getProject()));
fs.appendExcludes(ps.getExcludePatterns(getProject()));
- for (Enumeration e = selectorElements(); e.hasMoreElements(); ) {
+ for (Enumeration e = selectorElements(); e.hasMoreElements();) {
fs.appendSelector((FileSelector) e.nextElement());
}
fs.setDefaultexcludes(getDefaultexcludes());
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/War.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/War.java b/src/main/org/apache/tools/ant/taskdefs/War.java
index 0820627..b39c290 100644
--- a/src/main/org/apache/tools/ant/taskdefs/War.java
+++ b/src/main/org/apache/tools/ant/taskdefs/War.java
@@ -33,11 +33,11 @@ import org.apache.tools.zip.ZipOutputStream;
* Contains special treatment for files that should end up in the
* <code>WEB-INF/lib</code>, <code>WEB-INF/classes</code> or
* <code>WEB-INF</code> directories of the Web Application Archive.</p>
- *
+ *
* <p>(The War task is a shortcut for specifying the particular layout of a WAR file.
* The same thing can be accomplished by using the <i>prefix</i> and <i>fullpath</i>
* attributes of zipfilesets in a Zip or Jar task.)</p>
- *
+ *
* <p>The extended zipfileset element from the zip task
* (with attributes <i>prefix</i>, <i>fullpath</i>, and <i>src</i>)
* is available in the War task.</p>
@@ -151,7 +151,8 @@ public class War extends Jar {
* @throws IOException on output error
* @throws BuildException if invalid configuration
*/
- protected void initZipOutputStream(ZipOutputStream zOut)
+ @Override
+ protected void initZipOutputStream(ZipOutputStream zOut)
throws IOException, BuildException {
super.initZipOutputStream(zOut);
}
@@ -171,7 +172,8 @@ public class War extends Jar {
* @param mode the Unix permissions to set.
* @throws IOException on output error
*/
- protected void zipFile(File file, ZipOutputStream zOut, String vPath,
+ @Override
+ protected void zipFile(File file, ZipOutputStream zOut, String vPath,
int mode)
throws IOException {
// If the file being added is WEB-INF/web.xml, we warn if it's
@@ -215,7 +217,8 @@ public class War extends Jar {
* Make sure we don't think we already have a web.xml next time this task
* gets executed.
*/
- protected void cleanUp() {
+ @Override
+ protected void cleanUp() {
if (addedWebXmlFile == null
&& deploymentDescriptor == null
&& needxmlfile
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
index df22cf2..304995c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
@@ -51,7 +51,7 @@ public interface XSLTLiaison {
* @param name the parameter name.
* @param expression the parameter value as an expression string.
* @throws Exception thrown if any problems happens.
- * @see XSLTLiaison4#addParam(java.lang.String, java.lang.Object)
+ * @see XSLTLiaison4#addParam(java.lang.String, java.lang.Object)
* @since Ant 1.3
*/
void addParam(String name, String expression) throws Exception;
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison4.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison4.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison4.java
index efc3f5b..5de380b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison4.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison4.java
@@ -17,8 +17,6 @@
*/
package org.apache.tools.ant.taskdefs;
-import javax.xml.transform.Transformer;
-
/**
* Extends Proxy interface for XSLT processors: adds support for XSLT parameters
* of various types (not only String)
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index c5d2309..91ea062 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -210,7 +210,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @since Ant 1.8.0
*/
private boolean failOnNoResources = true;
-
+
/**
* For evaluating template params
*
@@ -617,7 +617,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
*/
public boolean getSuppressWarnings() {
return suppressWarnings;
- }
+ }
/**
* Whether transformation errors should make the build fail.
@@ -978,7 +978,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
/** The parameter's value */
private String expression = null;
-
+
/**
* Type of the expression.
* @see ParamType
@@ -1011,7 +1011,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* The parameter value -
* can be a primitive type value or an XPath expression.
* @param expression the parameter's value/expression.
- * @see #setType(java.lang.String)
+ * @see #setType(java.lang.String)
*/
public void setExpression(String expression) {
this.expression = expression;
@@ -1024,7 +1024,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
public void setType(String type) {
this.type = type;
}
-
+
/**
* Get the parameter name
*
@@ -1113,7 +1113,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
&& ph.testUnlessCondition(unlessCond);
}
} // Param
-
+
/**
* Enum for types of the parameter expression.
*
@@ -1134,7 +1134,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* <p>Default type (if omited) is primitive String. So if the expression is e.g
* "true" with no type, in XSLT it will be only a text string, not true
* boolean.</p>
- *
+ *
* @see Param#setType(java.lang.String)
* @see Param#setExpression(java.lang.String)
* @since Ant 1.9.3
@@ -1151,7 +1151,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
XPATH_NUMBER,
XPATH_NODE,
XPATH_NODESET;
-
+
public static final Map<ParamType, QName> XPATH_TYPES;
static {
@@ -1230,11 +1230,12 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
public void init() throws BuildException {
super.init();
xmlCatalog.setProject(getProject());
-
+
xpathFactory = XPathFactory.newInstance();
xpath = xpathFactory.newXPath();
xpath.setXPathVariableResolver(new XPathVariableResolver() {
- public Object resolveVariable(QName variableName) {
+ @Override
+ public Object resolveVariable(QName variableName) {
return getProject().getProperty(variableName.toString());
}
});
@@ -1247,7 +1248,8 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @exception BuildException if the stylesheet cannot be loaded.
* @deprecated since Ant 1.7
*/
- protected void configureLiaison(File stylesheet) throws BuildException {
+ @Deprecated
+ protected void configureLiaison(File stylesheet) throws BuildException {
FileResource fr = new FileResource();
fr.setProject(getProject());
fr.setFile(stylesheet);
@@ -1314,7 +1316,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
handleTransformationError(ex);
}
}
-
+
/**
* Evaluates parameter expression according to its type.
*
@@ -1530,7 +1532,8 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @return null
* @throws BuildException never
*/
- public Object createDynamicElement(String name) throws BuildException {
+ @Override
+ public Object createDynamicElement(String name) throws BuildException {
return null;
}
@@ -1541,7 +1544,8 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @param value the value of the attribute
* @throws BuildException on error
*/
- public void setDynamicAttribute(String name, String value) throws BuildException {
+ @Override
+ public void setDynamicAttribute(String name, String value) throws BuildException {
// only 'name' and 'value' exist.
if ("name".equalsIgnoreCase(name)) {
this.name = value;
@@ -1576,11 +1580,14 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @since Ant 1.6.2
*/
private class StyleMapper implements FileNameMapper {
- public void setFrom(String from) {
+ @Override
+ public void setFrom(String from) {
}
- public void setTo(String to) {
+ @Override
+ public void setTo(String to) {
}
- public String[] mapFileName(String xmlFile) {
+ @Override
+ public String[] mapFileName(String xmlFile) {
int dotPos = xmlFile.lastIndexOf('.');
if (dotPos > 0) {
xmlFile = xmlFile.substring(0, dotPos);
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/Zip.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index 3d05349..451016e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -105,14 +105,16 @@ public class Zip extends MatchingTask {
private static final ResourceSelector MISSING_SELECTOR =
new ResourceSelector() {
- public boolean isSelected(Resource target) {
+ @Override
+ public boolean isSelected(Resource target) {
return !target.isExists();
}
};
private static final ResourceUtils.ResourceSelectorProvider
MISSING_DIR_PROVIDER = new ResourceUtils.ResourceSelectorProvider() {
- public ResourceSelector
+ @Override
+ public ResourceSelector
getTargetSelectorForSource(Resource sr) {
return MISSING_SELECTOR;
}
@@ -237,7 +239,8 @@ public class Zip extends MatchingTask {
* Use setDestFile(File) instead.
* @ant.attribute ignore="true"
*/
- public void setZipfile(File zipFile) {
+ @Deprecated
+ public void setZipfile(File zipFile) {
setDestFile(zipFile);
}
@@ -250,7 +253,8 @@ public class Zip extends MatchingTask {
* Use setDestFile(File) instead.
* @ant.attribute ignore="true"
*/
- public void setFile(File file) {
+ @Deprecated
+ public void setFile(File file) {
setDestFile(file);
}
@@ -383,7 +387,8 @@ public class Zip extends MatchingTask {
* The string values for the enumerated value
* @return the values
*/
- public String[] getValues() {
+ @Override
+ public String[] getValues() {
return new String[] {"fail", "skip", "create"};
}
}
@@ -581,7 +586,8 @@ public class Zip extends MatchingTask {
* validate and build
* @throws BuildException on error
*/
- public void execute() throws BuildException {
+ @Override
+ public void execute() throws BuildException {
if (doubleFilePass) {
skipWriting = true;
@@ -628,7 +634,7 @@ public class Zip extends MatchingTask {
}
final int size = resources.size();
for (int i = 0; i < size; i++) {
- ResourceCollection rc = (ResourceCollection) resources.elementAt(i);
+ ResourceCollection rc = resources.elementAt(i);
vfss.addElement(rc);
}
@@ -702,7 +708,7 @@ public class Zip extends MatchingTask {
final int addSize = addedFiles.size();
for (int i = 0; i < addSize; i++) {
PatternSet.NameEntry ne = oldFiles.createExclude();
- ne.setName((String) addedFiles.elementAt(i));
+ ne.setName(addedFiles.elementAt(i));
}
DirectoryScanner ds =
oldFiles.getDirectoryScanner(getProject());
@@ -855,7 +861,7 @@ public class Zip extends MatchingTask {
for (int i = 0; i < size; i++) {
logWhenWriting("Processing groupfileset ", Project.MSG_VERBOSE);
- FileSet fs = (FileSet) groupfilesets.elementAt(i);
+ FileSet fs = groupfilesets.elementAt(i);
FileScanner scanner = fs.getDirectoryScanner(getProject());
String[] files = scanner.getIncludedFiles();
File basedir = scanner.getBasedir();
@@ -1249,7 +1255,7 @@ public class Zip extends MatchingTask {
ArchiveState as = getNonFileSetResourcesToAdd(rc, zipFile,
needsUpdate);
- FileSet[] fs = (FileSet[]) filesets.toArray(new FileSet[filesets
+ FileSet[] fs = filesets.toArray(new FileSet[filesets
.size()]);
ArchiveState as2 = getResourcesToAdd(fs, zipFile, as.isOutOfDate());
if (!as.isOutOfDate() && as2.isOutOfDate()) {
@@ -1285,7 +1291,8 @@ public class Zip extends MatchingTask {
* subclasses in several ways).
*/
private static final ThreadLocal<Boolean> HAVE_NON_FILE_SET_RESOURCES_TO_ADD = new ThreadLocal<Boolean>() {
- protected Boolean initialValue() {
+ @Override
+ protected Boolean initialValue() {
return Boolean.FALSE;
}
};
@@ -1630,7 +1637,8 @@ public class Zip extends MatchingTask {
// make sure directories are in alpha-order - this also
// ensures parents come before their children
Collections.sort(dirs, new Comparator<Resource>() {
- public int compare(Resource r1, Resource r2) {
+ @Override
+ public int compare(Resource r1, Resource r2) {
return r1.getName().compareTo(r2.getName());
}
});
@@ -1739,7 +1747,7 @@ public class Zip extends MatchingTask {
* @since Ant 1.8.0
*/
protected final ZipExtraField[] getCurrentExtraFields() {
- return (ZipExtraField[]) CURRENT_ZIP_EXTRA.get();
+ return CURRENT_ZIP_EXTRA.get();
}
/**
@@ -2032,7 +2040,8 @@ public class Zip extends MatchingTask {
protected Resource[] selectFileResources(Resource[] orig) {
return selectResources(orig,
new ResourceSelector() {
- public boolean isSelected(Resource r) {
+ @Override
+ public boolean isSelected(Resource r) {
if (!r.isDirectory()) {
return true;
} else if (doFilesonly) {
@@ -2056,7 +2065,8 @@ public class Zip extends MatchingTask {
protected Resource[] selectDirectoryResources(Resource[] orig) {
return selectResources(orig,
new ResourceSelector() {
- public boolean isSelected(Resource r) {
+ @Override
+ public boolean isSelected(Resource r) {
return r.isDirectory();
}
});
@@ -2108,7 +2118,8 @@ public class Zip extends MatchingTask {
* @see EnumeratedAttribute#getValues()
*/
/** {@inheritDoc} */
- public String[] getValues() {
+ @Override
+ public String[] getValues() {
return new String[] {"add", "preserve", "fail"};
}
}
@@ -2184,7 +2195,8 @@ public class Zip extends MatchingTask {
.NOT_ENCODEABLE);
}
- public String[] getValues() {
+ @Override
+ public String[] getValues() {
return new String[] {NEVER_KEY, ALWAYS_KEY, N_E_KEY};
}
@@ -2242,7 +2254,8 @@ public class Zip extends MatchingTask {
MODES.put(A_N_KEY, Zip64Mode.AsNeeded);
}
- public String[] getValues() {
+ @Override
+ public String[] getValues() {
return new String[] {NEVER_KEY, ALWAYS_KEY, A_N_KEY};
}
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
index 5ada0d7..404ee0d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
@@ -32,24 +32,24 @@ import org.apache.tools.ant.types.Path;
/**
* <p>The implementation of the apt compiler for JDK 1.5.</p>
- *
+ *
* <p>As usual, the low level entry points for Java tools are neither documented or
* stable; this entry point may change from that of 1.5.0_01-b08 without any
* warning at all. The IDE decompile of the tool entry points is as follows:</p>
* <pre>
* public class Main {
* public Main() ;
- *
+ *
* public static transient void main(String... strings);
- *
+ *
* public static transient int process(String... strings);
- *
+ *
* public static transient int process(PrintWriter printWriter,
* String... strings);
* public static transient int process(
* AnnotationProcessorFactory annotationProcessorFactory,
* String... strings);
- *
+ *
* public static transient int process(
* AnnotationProcessorFactory annotationProcessorFactory,
* PrintWriter printWriter,
@@ -157,7 +157,8 @@ public class AptCompilerAdapter extends DefaultCompilerAdapter {
* @return true on success.
* @throws BuildException if the compilation has problems.
*/
- public boolean execute() throws BuildException {
+ @Override
+ public boolean execute() throws BuildException {
attributes.log("Using apt compiler", Project.MSG_VERBOSE);
//set up the javac options
Commandline cmd = setupModernJavacCommand();
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterExtension.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterExtension.java b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterExtension.java
index 010deb0..038b9cb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterExtension.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterExtension.java
@@ -20,7 +20,7 @@ package org.apache.tools.ant.taskdefs.compilers;
/**
* Extension interface for compilers that support source extensions
* other than .java.
- *
+ *
* @since Ant 1.8.2
*/
public interface CompilerAdapterExtension {
@@ -32,7 +32,7 @@ public interface CompilerAdapterExtension {
* <p>For example, most compiler adapters will return [ "java" ],
* but a compiler adapter that can compile both Java and Groovy
* source code would return [ "java", "groovy" ].</p>
- *
+ *
* @return list of source file extensions recognized by this
* compiler adapter.
*/
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index 5b32d10..6819e5a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -97,7 +97,8 @@ public abstract class DefaultCompilerAdapter
*
* @param attributes a configured Javac task.
*/
- public void setJavac(Javac attributes) {
+ @Override
+ public void setJavac(final Javac attributes) {
this.attributes = attributes;
src = attributes.getSrcdir();
destDir = attributes.getDestdir();
@@ -135,8 +136,9 @@ public abstract class DefaultCompilerAdapter
* but specialized compilers can recognize multiple kinds
* of files.
*/
- public String[] getSupportedFileExtensions() {
- return new String[] { "java" };
+ @Override
+ public String[] getSupportedFileExtensions() {
+ return new String[] {"java"};
}
/**
@@ -153,7 +155,7 @@ public abstract class DefaultCompilerAdapter
* @return the compilation class path
*/
protected Path getCompileClasspath() {
- Path classpath = new Path(project);
+ final Path classpath = new Path(project);
// add dest dir to classpath so that previously compiled and
// untouched classes are on classpath
@@ -187,7 +189,7 @@ public abstract class DefaultCompilerAdapter
* @param cmd the command line
* @return the command line
*/
- protected Commandline setupJavacCommandlineSwitches(Commandline cmd) {
+ protected Commandline setupJavacCommandlineSwitches(final Commandline cmd) {
return setupJavacCommandlineSwitches(cmd, false);
}
@@ -198,9 +200,9 @@ public abstract class DefaultCompilerAdapter
* @param useDebugLevel if true set set the debug level with the -g switch
* @return the command line
*/
- protected Commandline setupJavacCommandlineSwitches(Commandline cmd,
- boolean useDebugLevel) {
- Path classpath = getCompileClasspath();
+ protected Commandline setupJavacCommandlineSwitches(final Commandline cmd,
+ final boolean useDebugLevel) {
+ final Path classpath = getCompileClasspath();
// For -sourcepath, use the "sourcepath" value if present.
// Otherwise default to the "srcdir" value.
Path sourcepath = null;
@@ -210,7 +212,7 @@ public abstract class DefaultCompilerAdapter
sourcepath = src;
}
- String memoryParameterPrefix = assumeJava11() ? "-J-" : "-J-X";
+ final String memoryParameterPrefix = assumeJava11() ? "-J-" : "-J-X";
if (memoryInitialSize != null) {
if (!attributes.isForkedJavac()) {
attributes.log("Since fork is false, ignoring "
@@ -251,9 +253,9 @@ public abstract class DefaultCompilerAdapter
// Just add "sourcepath" to classpath ( for JDK1.1 )
// as well as "bootclasspath" and "extdirs"
if (assumeJava11()) {
- Path cp = new Path(project);
+ final Path cp = new Path(project);
- Path bp = getBootClassPath();
+ final Path bp = getBootClassPath();
if (bp.size() > 0) {
cp.append(bp);
}
@@ -277,7 +279,7 @@ public abstract class DefaultCompilerAdapter
cmd.createArgument().setValue(target);
}
- Path bp = getBootClassPath();
+ final Path bp = getBootClassPath();
if (bp.size() > 0) {
cmd.createArgument().setValue("-bootclasspath");
cmd.createArgument().setPath(bp);
@@ -295,7 +297,7 @@ public abstract class DefaultCompilerAdapter
}
if (debug) {
if (useDebugLevel && !assumeJava11()) {
- String debugLevel = attributes.getDebugLevel();
+ final String debugLevel = attributes.getDebugLevel();
if (debugLevel != null) {
cmd.createArgument().setValue("-g:" + debugLevel);
} else {
@@ -337,7 +339,7 @@ public abstract class DefaultCompilerAdapter
* @param cmd the command line
* @return the command line
*/
- protected Commandline setupModernJavacCommandlineSwitches(Commandline cmd) {
+ protected Commandline setupModernJavacCommandlineSwitches(final Commandline cmd) {
setupJavacCommandlineSwitches(cmd, true);
if (!assumeJava13()) { // -source added with JDK 1.4
final String t = attributes.getTarget();
@@ -359,7 +361,7 @@ public abstract class DefaultCompilerAdapter
* @return the command line
*/
protected Commandline setupModernJavacCommand() {
- Commandline cmd = new Commandline();
+ final Commandline cmd = new Commandline();
setupModernJavacCommandlineSwitches(cmd);
logAndAddFilesToCompile(cmd);
@@ -380,8 +382,8 @@ public abstract class DefaultCompilerAdapter
* @param debugLevelCheck if true set the debug level with the -g switch
* @return the command line
*/
- protected Commandline setupJavacCommand(boolean debugLevelCheck) {
- Commandline cmd = new Commandline();
+ protected Commandline setupJavacCommand(final boolean debugLevelCheck) {
+ final Commandline cmd = new Commandline();
setupJavacCommandlineSwitches(cmd, debugLevelCheck);
logAndAddFilesToCompile(cmd);
return cmd;
@@ -392,11 +394,11 @@ public abstract class DefaultCompilerAdapter
* "niceSourceList"
* @param cmd the command line
*/
- protected void logAndAddFilesToCompile(Commandline cmd) {
+ protected void logAndAddFilesToCompile(final Commandline cmd) {
attributes.log("Compilation " + cmd.describeArguments(),
Project.MSG_VERBOSE);
- StringBuffer niceSourceList = new StringBuffer("File");
+ final StringBuffer niceSourceList = new StringBuffer("File");
if (compileList.length != 1) {
niceSourceList.append("s");
}
@@ -405,7 +407,7 @@ public abstract class DefaultCompilerAdapter
niceSourceList.append(StringUtils.LINE_SEP);
for (int i = 0; i < compileList.length; i++) {
- String arg = compileList[i].getAbsolutePath();
+ final String arg = compileList[i].getAbsolutePath();
cmd.createArgument().setValue(arg);
niceSourceList.append(" ");
niceSourceList.append(arg);
@@ -424,7 +426,7 @@ public abstract class DefaultCompilerAdapter
* system.
* @return the exit code of the compilation
*/
- protected int executeExternalCompile(String[] args, int firstFileName) {
+ protected int executeExternalCompile(final String[] args, final int firstFileName) {
return executeExternalCompile(args, firstFileName, true);
}
@@ -447,8 +449,8 @@ public abstract class DefaultCompilerAdapter
*
* @since Ant 1.6
*/
- protected int executeExternalCompile(String[] args, int firstFileName,
- boolean quoteFiles) {
+ protected int executeExternalCompile(final String[] args, final int firstFileName,
+ final boolean quoteFiles) {
String[] commandArray = null;
File tmpFile = null;
@@ -480,7 +482,7 @@ public abstract class DefaultCompilerAdapter
commandArray = new String[firstFileName + 1];
System.arraycopy(args, 0, commandArray, 0, firstFileName);
commandArray[firstFileName] = "@" + tmpFile;
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new BuildException("Error creating temporary file",
e, location);
} finally {
@@ -491,7 +493,7 @@ public abstract class DefaultCompilerAdapter
}
try {
- Execute exe = new Execute(
+ final Execute exe = new Execute(
new LogStreamHandler(attributes,
Project.MSG_INFO,
Project.MSG_WARN));
@@ -505,7 +507,7 @@ public abstract class DefaultCompilerAdapter
exe.setCommandline(commandArray);
exe.execute();
return exe.getExitValue();
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new BuildException("Error running " + args[0]
+ " compiler", e, location);
}
@@ -522,7 +524,8 @@ public abstract class DefaultCompilerAdapter
* @deprecated since 1.5.x.
* Use org.apache.tools.ant.types.Path#addExtdirs instead.
*/
- protected void addExtdirsToClasspath(Path classpath) {
+ @Deprecated
+ protected void addExtdirsToClasspath(final Path classpath) {
classpath.addExtdirs(extdirs);
}
@@ -530,7 +533,7 @@ public abstract class DefaultCompilerAdapter
* Adds the command line arguments specific to the current implementation.
* @param cmd the command line to use
*/
- protected void addCurrentCompilerArgs(Commandline cmd) {
+ protected void addCurrentCompilerArgs(final Commandline cmd) {
cmd.addArguments(getJavac().getCurrentCompilerArgs());
}
@@ -619,7 +622,7 @@ public abstract class DefaultCompilerAdapter
* Shall we assume command line switches for the given version of Java?
* @since Ant 1.8.3
*/
- private boolean assumeJavaXY(String javacXY, String javaEnvVersionXY) {
+ private boolean assumeJavaXY(final String javacXY, final String javaEnvVersionXY) {
return javacXY.equals(attributes.getCompilerVersion())
|| ("classic".equals(attributes.getCompilerVersion())
&& JavaEnvUtils.isJavaVersion(javaEnvVersionXY))
@@ -637,7 +640,7 @@ public abstract class DefaultCompilerAdapter
* specified and the system bootclasspath.
*/
protected Path getBootClassPath() {
- Path bp = new Path(project);
+ final Path bp = new Path(project);
if (bootclasspath != null) {
bp.append(bootclasspath);
}
@@ -658,8 +661,8 @@ public abstract class DefaultCompilerAdapter
return assumeJava11() ? null : "-g:none";
}
- private void setImplicitSourceSwitch(Commandline cmd,
- String target, String source) {
+ private void setImplicitSourceSwitch(final Commandline cmd,
+ final String target, final String source) {
attributes.log("", Project.MSG_WARN);
attributes.log(" WARNING", Project.MSG_WARN);
attributes.log("", Project.MSG_WARN);
@@ -723,7 +726,7 @@ public abstract class DefaultCompilerAdapter
* <p>support for -source 1.1 and -source 1.2 has been added with
* JDK 1.4.2 but isn't present in 1.5.0+</p>
*/
- private String adjustSourceValue(String source) {
+ private String adjustSourceValue(final String source) {
return (source.equals("1.1") || source.equals("1.2")) ? "1.3" : source;
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
index d7206c3..101c78a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
@@ -33,19 +33,19 @@ import org.apache.tools.ant.ProjectComponent;
* <p>Test for a host being reachable using ICMP "ping" packets & echo operations.
* Ping packets are very reliable for assessing reachability in a LAN or WAN,
* but they do not get through any well-configured firewall. Echo (port 7) may.</p>
- *
+ *
* <p>This condition turns unknown host exceptions into false conditions. This is
* because on a laptop, DNS is one of the first services lost when the network
* goes; you are implicitly offline.</p>
- *
+ *
* <p>If a URL is supplied instead of a host, the hostname is extracted and used in
* the test--all other parts of the URL are discarded.</p>
- *
+ *
* <p>The test may not work through firewalls; that is, something may be reachable
* using a protocol such as HTTP, while the lower level ICMP packets get dropped
* on the floor. Similarly, a host may be detected as reachable with ICMP, but not
* reachable on other ports (i.e. port 80), because of firewalls.</p>
- *
+ *
* <p>Requires Java 5+ to work properly. On Java 1.4, if a hostname
* can be resolved, the destination is assumed to be reachable.</p>
*
@@ -139,7 +139,8 @@ public class IsReachable extends ProjectComponent implements Condition {
* @throws org.apache.tools.ant.BuildException
* if an error occurs
*/
- public boolean eval() throws BuildException {
+ @Override
+ public boolean eval() throws BuildException {
if (empty(host) && empty(url)) {
throw new BuildException(ERROR_NO_HOSTNAME);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
index dcf4fc6..0096aad 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
@@ -88,11 +88,11 @@ class ChangeLogParser {
ArrayList names = new ArrayList();
if (packageName != null) {
for (StringTokenizer tok = new StringTokenizer(packageName);
- tok.hasMoreTokens(); ) {
+ tok.hasMoreTokens();) {
names.add(tok.nextToken());
}
}
- for (Iterator iter = modules.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = modules.iterator(); iter.hasNext();) {
AbstractCvsTask.Module m = (AbstractCvsTask.Module) iter.next();
names.add(m.getName());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/1b76f1b6/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
index 38606fe..112feb0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
@@ -144,7 +144,7 @@ public class CvsTagDiff extends AbstractCvsTask {
private File mydestfile;
/**
- * Used to skip over removed files
+ * Used to skip over removed files
*/
private boolean ignoreRemoved = false;
@@ -167,7 +167,8 @@ public class CvsTagDiff extends AbstractCvsTask {
* The package/module to analyze.
* @param p the name of the package to analyse
*/
- public void setPackage(String p) {
+ @Override
+ public void setPackage(String p) {
mypackage = p;
}
@@ -222,7 +223,7 @@ public class CvsTagDiff extends AbstractCvsTask {
* @param b the ignore removed indicator.
*
* @since Ant 1.8.0
- */
+ */
public void setIgnoreRemoved(boolean b) {
ignoreRemoved = b;
}
@@ -233,7 +234,8 @@ public class CvsTagDiff extends AbstractCvsTask {
*
* @exception BuildException if an error occurs
*/
- public void execute() throws BuildException {
+ @Override
+ public void execute() throws BuildException {
// validate the input parameters
validate();