You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2014/07/12 18:25:40 UTC
[2/4] whitespace
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/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 3751b02..35109fa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
@@ -99,7 +99,7 @@ public class SubAnt extends Task {
* @since Ant 1.6.2
*/
@Override
- public void handleOutput(String output) {
+ public void handleOutput(String output) {
if (ant != null) {
ant.handleOutput(output);
} else {
@@ -123,7 +123,7 @@ public class SubAnt extends Task {
* @since Ant 1.6.2
*/
@Override
- public int handleInput(byte[] buffer, int offset, int length)
+ public int handleInput(byte[] buffer, int offset, int length)
throws IOException {
if (ant != null) {
return ant.handleInput(buffer, offset, length);
@@ -140,7 +140,7 @@ public class SubAnt extends Task {
* @since Ant 1.6.2
*/
@Override
- public void handleFlush(String output) {
+ public void handleFlush(String output) {
if (ant != null) {
ant.handleFlush(output);
} else {
@@ -156,7 +156,7 @@ public class SubAnt extends Task {
* @since Ant 1.6.2
*/
@Override
- public void handleErrorOutput(String output) {
+ public void handleErrorOutput(String output) {
if (ant != null) {
ant.handleErrorOutput(output);
} else {
@@ -172,7 +172,7 @@ public class SubAnt extends Task {
* @since Ant 1.6.2
*/
@Override
- public void handleErrorFlush(String output) {
+ public void handleErrorFlush(String output) {
if (ant != null) {
ant.handleErrorFlush(output);
} else {
@@ -184,7 +184,7 @@ public class SubAnt extends Task {
* Runs the various sub-builds.
*/
@Override
- public void execute() {
+ public void execute() {
if (buildpath == null) {
throw new BuildException("No buildpath specified");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/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 29982af..c1c7552 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Sync.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Sync.java
@@ -73,7 +73,7 @@ public class Sync extends Task {
* @see Task#init()
*/
@Override
- public void init()
+ public void init()
throws BuildException {
// Instantiate it
myCopy = new MyCopy();
@@ -99,7 +99,7 @@ public class Sync extends Task {
* @see Task#execute()
*/
@Override
- public void execute()
+ public void execute()
throws BuildException {
// The destination of the files to copy
File toDir = myCopy.getToDir();
@@ -467,7 +467,7 @@ public class Sync extends Task {
*/
/** {@inheritDoc} */
@Override
- protected void scan(File fromDir, File toDir, String[] files,
+ protected void scan(File fromDir, File toDir, String[] files,
String[] dirs) {
assertTrue("No mapper", mapperElement == null);
@@ -486,7 +486,7 @@ public class Sync extends Task {
*/
/** {@inheritDoc} */
@Override
- protected Map scan(Resource[] resources, File toDir) {
+ protected Map scan(Resource[] resources, File toDir) {
assertTrue("No mapper", mapperElement == null);
for (int i = 0; i < resources.length; i++) {
@@ -517,7 +517,7 @@ public class Sync extends Task {
* @since Ant 1.7
*/
@Override
- protected boolean supportsNonFileResources() {
+ protected boolean supportsNonFileResources() {
return true;
}
}
@@ -549,7 +549,7 @@ public class Sync extends Task {
* @throws BuildException always
*/
@Override
- public void setDir(File dir) throws BuildException {
+ public void setDir(File dir) throws BuildException {
throw new BuildException("preserveintarget doesn't support the dir "
+ "attribute");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/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 b39c290..7daf08e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/War.java
+++ b/src/main/org/apache/tools/ant/taskdefs/War.java
@@ -152,7 +152,7 @@ public class War extends Jar {
* @throws BuildException if invalid configuration
*/
@Override
- protected void initZipOutputStream(ZipOutputStream zOut)
+ protected void initZipOutputStream(ZipOutputStream zOut)
throws IOException, BuildException {
super.initZipOutputStream(zOut);
}
@@ -173,7 +173,7 @@ public class War extends Jar {
* @throws IOException on output error
*/
@Override
- protected void zipFile(File file, ZipOutputStream zOut, String vPath,
+ 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
@@ -218,7 +218,7 @@ public class War extends Jar {
* gets executed.
*/
@Override
- protected void cleanUp() {
+ protected void cleanUp() {
if (addedWebXmlFile == null
&& deploymentDescriptor == null
&& needxmlfile
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/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 32ef10a..9d10f2c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -1234,7 +1234,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
xpathFactory = XPathFactory.newInstance();
xpath = xpathFactory.newXPath();
xpath.setXPathVariableResolver(new XPathVariableResolver() {
- public Object resolveVariable(final QName variableName) {
+ public Object resolveVariable(final QName variableName) {
return getProject().getProperty(variableName.toString());
}
});
@@ -1248,7 +1248,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @deprecated since Ant 1.7
*/
@Deprecated
- protected void configureLiaison(final File stylesheet) throws BuildException {
+ protected void configureLiaison(final File stylesheet) throws BuildException {
final FileResource fr = new FileResource();
fr.setProject(getProject());
fr.setFile(stylesheet);
@@ -1531,7 +1531,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @return null
* @throws BuildException never
*/
- public Object createDynamicElement(final String name) throws BuildException {
+ public Object createDynamicElement(final String name) throws BuildException {
return null;
}
@@ -1542,7 +1542,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @param value the value of the attribute
* @throws BuildException on error
*/
- public void setDynamicAttribute(final String name, final String value) throws BuildException {
+ public void setDynamicAttribute(final String name, final String value) throws BuildException {
// only 'name' and 'value' exist.
if ("name".equalsIgnoreCase(name)) {
this.name = value;
@@ -1577,11 +1577,11 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @since Ant 1.6.2
*/
private class StyleMapper implements FileNameMapper {
- public void setFrom(final String from) {
+ public void setFrom(final String from) {
}
- public void setTo(final String to) {
+ public void setTo(final String to) {
}
- public String[] mapFileName(String xmlFile) {
+ public String[] mapFileName(String xmlFile) {
final int dotPos = xmlFile.lastIndexOf('.');
if (dotPos > 0) {
xmlFile = xmlFile.substring(0, dotPos);
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/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 aed943e..ddc9bd4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -105,14 +105,14 @@ public class Zip extends MatchingTask {
private static final ResourceSelector MISSING_SELECTOR =
new ResourceSelector() {
- public boolean isSelected(final Resource target) {
+ public boolean isSelected(final Resource target) {
return !target.isExists();
}
};
private static final ResourceUtils.ResourceSelectorProvider
MISSING_DIR_PROVIDER = new ResourceUtils.ResourceSelectorProvider() {
- public ResourceSelector
+ public ResourceSelector
getTargetSelectorForSource(final Resource sr) {
return MISSING_SELECTOR;
}
@@ -238,7 +238,7 @@ public class Zip extends MatchingTask {
* @ant.attribute ignore="true"
*/
@Deprecated
- public void setZipfile(final File zipFile) {
+ public void setZipfile(final File zipFile) {
setDestFile(zipFile);
}
@@ -252,7 +252,7 @@ public class Zip extends MatchingTask {
* @ant.attribute ignore="true"
*/
@Deprecated
- public void setFile(final File file) {
+ public void setFile(final File file) {
setDestFile(file);
}
@@ -386,7 +386,7 @@ public class Zip extends MatchingTask {
* @return the values
*/
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {"fail", "skip", "create"};
}
}
@@ -585,7 +585,7 @@ public class Zip extends MatchingTask {
* @throws BuildException on error
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
if (doubleFilePass) {
skipWriting = true;
@@ -1290,7 +1290,7 @@ public class Zip extends MatchingTask {
*/
private static final ThreadLocal<Boolean> HAVE_NON_FILE_SET_RESOURCES_TO_ADD = new ThreadLocal<Boolean>() {
@Override
- protected Boolean initialValue() {
+ protected Boolean initialValue() {
return Boolean.FALSE;
}
};
@@ -1635,7 +1635,7 @@ 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(final Resource r1, final Resource r2) {
+ public int compare(final Resource r1, final Resource r2) {
return r1.getName().compareTo(r2.getName());
}
});
@@ -2037,7 +2037,7 @@ public class Zip extends MatchingTask {
protected Resource[] selectFileResources(final Resource[] orig) {
return selectResources(orig,
new ResourceSelector() {
- public boolean isSelected(final Resource r) {
+ public boolean isSelected(final Resource r) {
if (!r.isDirectory()) {
return true;
} else if (doFilesonly) {
@@ -2061,7 +2061,7 @@ public class Zip extends MatchingTask {
protected Resource[] selectDirectoryResources(final Resource[] orig) {
return selectResources(orig,
new ResourceSelector() {
- public boolean isSelected(final Resource r) {
+ public boolean isSelected(final Resource r) {
return r.isDirectory();
}
});
@@ -2114,7 +2114,7 @@ public class Zip extends MatchingTask {
*/
/** {@inheritDoc} */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {"add", "preserve", "fail"};
}
}
@@ -2191,7 +2191,7 @@ public class Zip extends MatchingTask {
}
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {NEVER_KEY, ALWAYS_KEY, N_E_KEY};
}
@@ -2250,7 +2250,7 @@ public class Zip extends MatchingTask {
}
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {NEVER_KEY, ALWAYS_KEY, A_N_KEY};
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/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 85a6066..9503ac0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
@@ -157,7 +157,7 @@ public class AptCompilerAdapter extends DefaultCompilerAdapter {
* @return true on success.
* @throws BuildException if the compilation has problems.
*/
- public boolean execute() throws BuildException {
+ public boolean execute() throws BuildException {
attributes.log("Using apt compiler", Project.MSG_VERBOSE);
//set up the javac options
final Commandline cmd = setupModernJavacCommand();
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/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 b30a93b..9f746c9 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,7 @@ public abstract class DefaultCompilerAdapter
*
* @param attributes a configured Javac task.
*/
- public void setJavac(final Javac attributes) {
+ public void setJavac(final Javac attributes) {
this.attributes = attributes;
src = attributes.getSrcdir();
destDir = attributes.getDestdir();
@@ -135,7 +135,7 @@ public abstract class DefaultCompilerAdapter
* but specialized compilers can recognize multiple kinds
* of files.
*/
- public String[] getSupportedFileExtensions() {
+ public String[] getSupportedFileExtensions() {
return new String[] {"java"};
}
@@ -523,7 +523,7 @@ public abstract class DefaultCompilerAdapter
* Use org.apache.tools.ant.types.Path#addExtdirs instead.
*/
@Deprecated
- protected void addExtdirsToClasspath(final Path classpath) {
+ protected void addExtdirsToClasspath(final Path classpath) {
classpath.addExtdirs(extdirs);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/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 99d84fc..e699da1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
@@ -139,7 +139,7 @@ public class IsReachable extends ProjectComponent implements Condition {
* @throws org.apache.tools.ant.BuildException
* if an error occurs
*/
- public boolean eval() throws BuildException {
+ 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/df33426b/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 112feb0..a90bcc0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
@@ -168,7 +168,7 @@ public class CvsTagDiff extends AbstractCvsTask {
* @param p the name of the package to analyse
*/
@Override
- public void setPackage(String p) {
+ public void setPackage(String p) {
mypackage = p;
}
@@ -235,7 +235,7 @@ public class CvsTagDiff extends AbstractCvsTask {
* @exception BuildException if an error occurs
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
// validate the input parameters
validate();
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
index 13f6b8f..838f122 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -156,7 +156,7 @@ public class PropertyFile extends Task {
* @throws BuildException on error.
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
checkParameters();
readFile();
executeOperation();
@@ -616,7 +616,7 @@ public class PropertyFile extends Task {
/** {@inheritDoc}. */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {"+", "-", "=", "del"};
}
@@ -652,7 +652,7 @@ public class PropertyFile extends Task {
/** {@inheritDoc} */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {"int", "date", "string"};
}
@@ -719,7 +719,7 @@ public class PropertyFile extends Task {
/** {@inheritDoc}. */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return UNITS;
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
index 64e552b..d088096 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
@@ -466,7 +466,7 @@ public class ReplaceRegExp extends Task {
* @throws BuildException is there is a problem in the task execution.
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
if (regex == null) {
throw new BuildException("No expression to match.");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index a5b8b64..cf66e91 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -143,7 +143,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* @param stylesheet a <code>File</code> value
* @throws Exception on error
*/
- public void setStylesheet(final File stylesheet) throws Exception {
+ public void setStylesheet(final File stylesheet) throws Exception {
final FileResource fr = new FileResource();
fr.setProject(project);
fr.setFile(stylesheet);
@@ -155,7 +155,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* @param stylesheet a {@link org.apache.tools.ant.types.Resource} value
* @throws Exception on error
*/
- public void setStylesheet(final Resource stylesheet) throws Exception {
+ public void setStylesheet(final Resource stylesheet) throws Exception {
if (this.stylesheet != null) {
// resetting the stylesheet - reset transformer
transformer = null;
@@ -175,7 +175,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* @param outfile the result file
* @throws Exception on error
*/
- public void transform(final File infile, final File outfile) throws Exception {
+ public void transform(final File infile, final File outfile) throws Exception {
if (transformer == null) {
createTransformer();
}
@@ -504,7 +504,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* @param name the name of the parameter
* @param value the value of the parameter
*/
- public void addParam(final String name, final String value) {
+ public void addParam(final String name, final String value) {
params.put(name, value);
}
@@ -514,7 +514,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* @param value the value of the parameter
* @since Ant 1.9.3
*/
- public void addParam(final String name, final Object value) {
+ public void addParam(final String name, final Object value) {
params.put(name, value);
}
@@ -522,7 +522,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* Set a logger.
* @param l a logger.
*/
- public void setLogger(final XSLTLogger l) {
+ public void setLogger(final XSLTLogger l) {
logger = l;
}
@@ -530,7 +530,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* Log an error.
* @param e the exception to log.
*/
- public void error(final TransformerException e) {
+ public void error(final TransformerException e) {
logError(e, "Error");
}
@@ -538,7 +538,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* Log a fatal error.
* @param e the exception to log.
*/
- public void fatalError(final TransformerException e) {
+ public void fatalError(final TransformerException e) {
logError(e, "Fatal Error");
throw new BuildException("Fatal error during transformation using " + stylesheet + ": " + e.getMessageAndLocation(), e);
}
@@ -547,7 +547,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* Log a warning.
* @param e the exception to log.
*/
- public void warning(final TransformerException e) {
+ public void warning(final TransformerException e) {
if (!suppressWarnings) {
logError(e, "Warning");
}
@@ -602,7 +602,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* Use org.apache.tools.ant.util.JAXPUtils#getSystemId instead.
*/
@Deprecated
- protected String getSystemId(final File file) {
+ protected String getSystemId(final File file) {
return JAXPUtils.getSystemId(file);
}
@@ -612,7 +612,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* @param xsltTask the XSLTProcess task instance from which this liasion
* is to be configured.
*/
- public void configure(final XSLTProcess xsltTask) {
+ public void configure(final XSLTProcess xsltTask) {
project = xsltTask.getProject();
final XSLTProcess.Factory factory = xsltTask.getFactory();
if (factory != null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.java b/src/main/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.java
index 0553060..e5da018 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.java
@@ -28,7 +28,6 @@ import org.apache.tools.ant.taskdefs.XSLTProcess;
import org.apache.xalan.trace.PrintTraceListener;
import org.apache.xalan.transformer.TransformerImpl;
-
/**
* Sets up trace support for a given transformer.
*
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.java
index 857c484..d3c35ce 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.java
@@ -44,7 +44,7 @@ public class MethodTypeCPInfo extends ConstantCPInfo {
* the stream.
*/
@Override
- public void read(final DataInputStream cpStream) throws IOException {
+ public void read(final DataInputStream cpStream) throws IOException {
methodDescriptorIndex = cpStream.readUnsignedShort();
}
@@ -56,7 +56,7 @@ public class MethodTypeCPInfo extends ConstantCPInfo {
* and against which this entry is to be resolved.
*/
@Override
- public void resolve(final ConstantPool constantPool) {
+ public void resolve(final ConstantPool constantPool) {
final Utf8CPInfo methodClass
= (Utf8CPInfo) constantPool.getEntry(methodDescriptorIndex);
methodClass.resolve(constantPool);
@@ -69,7 +69,7 @@ public class MethodTypeCPInfo extends ConstantCPInfo {
* @return the string representation of this constant pool entry.
*/
@Override
- public String toString() {
+ public String toString() {
if (!isResolved()) {
return "MethodDescriptorIndex: " + methodDescriptorIndex;
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
index 193f32c..cbc8526 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
@@ -167,7 +167,7 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool {
* ignored.
*/
@Override
- public void setGenericJarSuffix(String inString) {
+ public void setGenericJarSuffix(String inString) {
log("Since a generic JAR file is not created during processing, the "
+ "iPlanet Deployment Tool does not support the "
+ "\"genericjarsuffix\" attribute. It will be ignored.",
@@ -176,7 +176,7 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool {
/** {@inheritDoc}. */
@Override
- public void processDescriptor(String descriptorName, SAXParser saxParser) {
+ public void processDescriptor(String descriptorName, SAXParser saxParser) {
this.descriptorName = descriptorName;
this.iasDescriptorName = null;
@@ -196,7 +196,7 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool {
* @throws BuildException If the user selections are invalid.
*/
@Override
- protected void checkConfiguration(String descriptorFileName,
+ protected void checkConfiguration(String descriptorFileName,
SAXParser saxParser) throws BuildException {
int startOfName = descriptorFileName.lastIndexOf(File.separatorChar) + 1;
@@ -240,7 +240,7 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool {
* exception
*/
@Override
- protected Hashtable parseEjbFiles(String descriptorFileName,
+ protected Hashtable parseEjbFiles(String descriptorFileName,
SAXParser saxParser) throws IOException, SAXException {
Hashtable files;
@@ -313,7 +313,7 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool {
* @param ddPrefix not used
*/
@Override
- protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
+ protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
ejbFiles.put(META_DIR + IAS_DD, new File(getConfig().descriptorDir,
getIasDescriptorName()));
}
@@ -328,7 +328,7 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool {
* @return File representing the JAR file which will be written.
*/
@Override
- File getVendorOutputJarFile(String baseName) {
+ File getVendorOutputJarFile(String baseName) {
File jarFile = new File(getDestDir(), baseName + jarSuffix);
log("JAR file name: " + jarFile.toString(), Project.MSG_VERBOSE);
return jarFile;
@@ -342,7 +342,7 @@ public class IPlanetDeploymentTool extends GenericDeploymentTool {
* @return <code>null</code>.
*/
@Override
- protected String getPublicId() {
+ protected String getPublicId() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
index 676c707..5aba37c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
@@ -114,7 +114,7 @@ public class ExtensionSet
* @exception BuildException if this instance already has been configured.
*/
@Override
- public void setRefid(final Reference reference)
+ public void setRefid(final Reference reference)
throws BuildException {
if (!extensions.isEmpty() || !extensionsFilesets.isEmpty()) {
throw tooManyAttributes();
@@ -123,7 +123,7 @@ public class ExtensionSet
}
@Override
- protected synchronized void dieOnCircularReference(Stack stk, Project p)
+ protected synchronized void dieOnCircularReference(Stack stk, Project p)
throws BuildException {
if (isChecked()) {
return;
@@ -147,7 +147,7 @@ public class ExtensionSet
* @return the extensions in a string.
*/
@Override
- public String toString() {
+ public String toString() {
return "ExtensionSet" + Arrays.asList(toExtensions(getProject()));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Constants.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Constants.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Constants.java
index 18ab649..368c72e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Constants.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Constants.java
@@ -23,8 +23,8 @@ package org.apache.tools.ant.taskdefs.optional.junit;
*/
public class Constants {
- private Constants() {
- }
+ private Constants() {
+ }
static final String METHOD_NAMES = "methods=";
static final String HALT_ON_ERROR = "haltOnError=";
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java
index 0607f88..f03a409 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java
@@ -87,7 +87,7 @@ public class JUnit4TestMethodAdapter implements Test {
runner = request.getRunner();
}
- public int countTestCases() {
+ public int countTestCases() {
return runner.testCount();
}
@@ -103,12 +103,12 @@ public class JUnit4TestMethodAdapter implements Test {
return testClass;
}
- public void run(final TestResult result) {
+ public void run(final TestResult result) {
runner.run(cache.getNotifier(result));
}
@Override
- public String toString() {
+ public String toString() {
String testClassName = testClass.getName();
StringBuilder buf = new StringBuilder(testClassName.length()
+ 12 * methodNames.length)
@@ -146,7 +146,7 @@ public class JUnit4TestMethodAdapter implements Test {
}
@Override
- public boolean shouldRun(Description description) {
+ public boolean shouldRun(Description description) {
if (methodNames.length == 0) {
return false;
}
@@ -171,7 +171,7 @@ public class JUnit4TestMethodAdapter implements Test {
}
@Override
- public String describe() {
+ public String describe() {
StringBuilder buf = new StringBuilder(40);
if (methodNames.length == 0) {
buf.append("No methods");
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index a0ce632..2df34be 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -365,7 +365,7 @@ public class JUnitTask extends Task {
* @return array of allowed values
*/
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {"true", "yes", "false", "no",
"on", "off", "withOutAndErr"};
}
@@ -457,7 +457,7 @@ public class JUnitTask extends Task {
* @param sysp environment variable to add
*/
@Deprecated
- public void addSysproperty(final Environment.Variable sysp) {
+ public void addSysproperty(final Environment.Variable sysp) {
getCommandline().addSysproperty(sysp);
}
@@ -735,7 +735,7 @@ public class JUnitTask extends Task {
* @since Ant 1.4
*/
@Override
- public void init() {
+ public void init() {
antRuntimeClasses = new Path(getProject());
splitJUnit = !addClasspathResource("/junit/framework/TestCase.class");
addClasspathEntry("/org/apache/tools/ant/launch/AntMain.class");
@@ -782,7 +782,7 @@ public class JUnitTask extends Task {
path.add(extra);
}
mirrorLoader = (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
+ public Object run() {
return new SplitClassLoader(myLoader, path, getProject(),
new String[] {
"BriefJUnitResultFormatter",
@@ -816,7 +816,7 @@ public class JUnitTask extends Task {
* @since Ant 1.2
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
checkMethodLists();
setupJUnitDelegate();
@@ -870,7 +870,7 @@ public class JUnitTask extends Task {
this.id = id;
}
- public void run() {
+ public void run() {
try {
masterTask.oneJunitThread(iterator, id);
} catch (final BuildException b) {
@@ -1441,7 +1441,7 @@ public class JUnitTask extends Task {
* @since Ant 1.5
*/
@Override
- protected void handleOutput(final String output) {
+ protected void handleOutput(final String output) {
if (output.startsWith(TESTLISTENER_PREFIX)) {
log(output, Project.MSG_VERBOSE);
} else if (runner != null) {
@@ -1471,7 +1471,7 @@ public class JUnitTask extends Task {
* @since Ant 1.6
*/
@Override
- protected int handleInput(final byte[] buffer, final int offset, final int length)
+ protected int handleInput(final byte[] buffer, final int offset, final int length)
throws IOException {
if (runner != null) {
return runner.handleInput(buffer, offset, length);
@@ -1489,7 +1489,7 @@ public class JUnitTask extends Task {
* @since Ant 1.5.2
*/
@Override
- protected void handleFlush(final String output) {
+ protected void handleFlush(final String output) {
if (runner != null) {
runner.handleFlush(output);
if (showOutput) {
@@ -1508,7 +1508,7 @@ public class JUnitTask extends Task {
* @since Ant 1.5
*/
@Override
- public void handleErrorOutput(final String output) {
+ public void handleErrorOutput(final String output) {
if (runner != null) {
runner.handleErrorOutput(output);
if (showOutput) {
@@ -1528,7 +1528,7 @@ public class JUnitTask extends Task {
* @since Ant 1.5.2
*/
@Override
- public void handleErrorFlush(final String output) {
+ public void handleErrorFlush(final String output) {
if (runner != null) {
runner.handleErrorFlush(output);
if (showOutput) {
@@ -2009,7 +2009,7 @@ public class JUnitTask extends Task {
* @return true if everything is equal
*/
@Override
- public boolean equals(final Object other) {
+ public boolean equals(final Object other) {
if (other == null
|| other.getClass() != ForkedTestConfiguration.class) {
return false;
@@ -2034,7 +2034,7 @@ public class JUnitTask extends Task {
* @return hash code value
*/
@Override
- public int hashCode() {
+ public int hashCode() {
// CheckStyle:MagicNumber OFF
return (filterTrace ? 1 : 0)
+ (haltOnError ? 2 : 0)
@@ -2078,7 +2078,7 @@ public class JUnitTask extends Task {
/** {@inheritDoc}. */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {ONCE, PER_TEST, PER_BATCH};
}
}
@@ -2216,7 +2216,7 @@ public class JUnitTask extends Task {
* @param level the logging level to use.
*/
@Override
- protected void processLine(final String line, final int level) {
+ protected void processLine(final String line, final int level) {
if (line.startsWith(TESTLISTENER_PREFIX)) {
task.log(line, Project.MSG_VERBOSE);
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
index 86ccad7..835c013 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
@@ -170,7 +170,7 @@ public class JUnitTest extends BaseTest implements Cloneable {
/**
* Set the thread id
* @param thread the Ant id of the thread running this test
- * (this is not the system process or thread id)
+ * (this is not the system process or thread id)
* (this will be 0 in single-threaded mode).
* @since Ant 1.9.4
*/
@@ -528,7 +528,7 @@ public class JUnitTest extends BaseTest implements Cloneable {
* @return a clone of this test.
*/
@Override
- public Object clone() {
+ public Object clone() {
try {
JUnitTest t = (JUnitTest) super.clone();
t.props = props == null ? null : (Properties) props.clone();
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index 12a3acf..a457375 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -311,7 +311,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
return new PrintStream(
new OutputStream() {
@Override
- public void write(final int b) {
+ public void write(final int b) {
}
});
}
@@ -355,7 +355,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
/**
* Run the test.
*/
- public void run() {
+ public void run() {
res = new IgnoredTestResult();
res.addListener(wrapListener(this));
final int size = formatters.size();
@@ -677,7 +677,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
*
* @return 2 if errors occurred, 1 if tests failed else 0.
*/
- public int getRetCode() {
+ public int getRetCode() {
return retCode;
}
@@ -687,7 +687,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
* <p>A new Test is started.
* @param t the test.
*/
- public void startTest(final Test t) {
+ public void startTest(final Test t) {
final String testName = JUnitVersionHelper.getTestCaseName(t);
logTestListenerEvent("startTest(" + testName + ")");
}
@@ -698,7 +698,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
* <p>A Test is finished.
* @param test the test.
*/
- public void endTest(final Test test) {
+ public void endTest(final Test test) {
final String testName = JUnitVersionHelper.getTestCaseName(test);
logTestListenerEvent("endTest(" + testName + ")");
}
@@ -741,7 +741,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
* @param test the test.
* @param t the assertion thrown by the test.
*/
- public void addFailure(final Test test, final AssertionFailedError t) {
+ public void addFailure(final Test test, final AssertionFailedError t) {
addFailure(test, (Throwable) t);
}
@@ -752,7 +752,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
* @param test the test.
* @param t the error thrown by the test.
*/
- public void addError(final Test test, final Throwable t) {
+ public void addError(final Test test, final Throwable t) {
final String testName = JUnitVersionHelper.getTestCaseName(test);
logTestListenerEvent("addError(" + testName + ", " + t.getMessage() + ")");
if (haltOnError) {
@@ -765,7 +765,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
* @since Ant 1.6
* @param permissions the permissions to use.
*/
- public void setPermissions(final Permissions permissions) {
+ public void setPermissions(final Permissions permissions) {
perm = permissions;
}
@@ -773,7 +773,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
* Handle a string destined for standard output.
* @param output the string to output
*/
- public void handleOutput(final String output) {
+ public void handleOutput(final String output) {
if (!logTestListenerEvents && output.startsWith(JUnitTask.TESTLISTENER_PREFIX)) {
// ignore
} else if (systemOut != null) {
@@ -792,27 +792,27 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
*
* @since Ant 1.6
*/
- public int handleInput(final byte[] buffer, final int offset, final int length)
+ public int handleInput(final byte[] buffer, final int offset, final int length)
throws IOException {
return -1;
}
/** {@inheritDoc}. */
- public void handleErrorOutput(final String output) {
+ public void handleErrorOutput(final String output) {
if (systemError != null) {
systemError.print(output);
}
}
/** {@inheritDoc}. */
- public void handleFlush(final String output) {
+ public void handleFlush(final String output) {
if (systemOut != null) {
systemOut.print(output);
}
}
/** {@inheritDoc}. */
- public void handleErrorFlush(final String output) {
+ public void handleErrorFlush(final String output) {
if (systemError != null) {
systemError.print(output);
}
@@ -854,7 +854,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
}
/** {@inheritDoc}. */
- public void addFormatter(final JUnitTaskMirror.JUnitResultFormatterMirror f) {
+ public void addFormatter(final JUnitTaskMirror.JUnitResultFormatterMirror f) {
formatters.addElement(f);
}
@@ -1045,31 +1045,31 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
final JUnitTest test) {
runner.addFormatter(new JUnitResultFormatter() {
- public void startTestSuite(final JUnitTest suite) throws BuildException {
+ public void startTestSuite(final JUnitTest suite) throws BuildException {
}
- public void endTestSuite(final JUnitTest suite) throws BuildException {
+ public void endTestSuite(final JUnitTest suite) throws BuildException {
}
- public void setOutput(final OutputStream out) {
+ public void setOutput(final OutputStream out) {
}
- public void setSystemOutput(final String out) {
+ public void setSystemOutput(final String out) {
}
- public void setSystemError(final String err) {
+ public void setSystemError(final String err) {
}
- public void addError(final Test arg0, final Throwable arg1) {
+ public void addError(final Test arg0, final Throwable arg1) {
}
- public void addFailure(final Test arg0, final AssertionFailedError arg1) {
+ public void addFailure(final Test arg0, final AssertionFailedError arg1) {
}
- public void endTest(final Test arg0) {
+ public void endTest(final Test arg0) {
}
- public void startTest(final Test arg0) {
+ public void startTest(final Test arg0) {
registerTestCase(JUnitVersionHelper.getTestCaseName(arg0));
}
});
@@ -1226,7 +1226,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
private TestListenerWrapper wrapListener(final TestListener testListener) {
return new TestListenerWrapper(testListener) {
@Override
- public void addError(final Test test, final Throwable t) {
+ public void addError(final Test test, final Throwable t) {
if (junit4 && t instanceof AssertionFailedError) {
// JUnit 4 does not distinguish between errors and failures
// even in the JUnit 3 adapter.
@@ -1247,7 +1247,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
}
}
@Override
- public void addFailure(final Test test, final AssertionFailedError t) {
+ public void addFailure(final Test test, final AssertionFailedError t) {
testListener.addFailure(test, t);
}
public void addFailure(final Test test, final Throwable t) { // pre-3.4
@@ -1258,11 +1258,11 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
}
}
@Override
- public void endTest(final Test test) {
+ public void endTest(final Test test) {
testListener.endTest(test);
}
@Override
- public void startTest(final Test test) {
+ public void startTest(final Test test) {
testListener.startTest(test);
}
};
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java
index 5689ac1..e381a70 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java
@@ -43,7 +43,7 @@ public class TearDownOnVmCrash implements JUnitResultFormatter {
* Records the suite's name to later determine the class to invoke
* tearDown on.
*/
- public void startTestSuite(final JUnitTest suite) {
+ public void startTestSuite(final JUnitTest suite) {
suiteName = suite.getName();
if (suiteName != null &&
suiteName.endsWith(JUnitTask.NAME_OF_DUMMY_TEST)) {
@@ -57,7 +57,7 @@ public class TearDownOnVmCrash implements JUnitResultFormatter {
* test we get when a Batch fails and the error is an actual
* error generated by Ant.
*/
- public void addError(final Test fakeTest, final Throwable t) {
+ public void addError(final Test fakeTest, final Throwable t) {
if (suiteName != null
&& fakeTest instanceof JUnitTaskMirrorImpl.VmExitErrorTest) {
tearDown();
@@ -67,19 +67,19 @@ public class TearDownOnVmCrash implements JUnitResultFormatter {
// no need to implement the rest
public void addFailure(Test test, Throwable t) {}
- public void addFailure(Test test, AssertionFailedError t) {}
+ public void addFailure(Test test, AssertionFailedError t) {}
- public void startTest(Test test) {}
+ public void startTest(Test test) {}
- public void endTest(Test test) {}
+ public void endTest(Test test) {}
- public void endTestSuite(JUnitTest suite) {}
+ public void endTestSuite(JUnitTest suite) {}
- public void setOutput(OutputStream out) {}
+ public void setOutput(OutputStream out) {}
- public void setSystemOutput(String out) {}
+ public void setSystemOutput(String out) {}
- public void setSystemError(String err) {}
+ public void setSystemError(String err) {}
private void tearDown() {
try {
@@ -91,7 +91,7 @@ public class TearDownOnVmCrash implements JUnitResultFormatter {
testClass = Thread.currentThread().getContextClassLoader()
.loadClass(suiteName);
} catch (ClassNotFoundException cnfe) {
- // ignore
+ // ignore
}
}
if (testClass == null && getClass().getClassLoader() != null) {
@@ -99,7 +99,7 @@ public class TearDownOnVmCrash implements JUnitResultFormatter {
testClass =
getClass().getClassLoader().loadClass(suiteName);
} catch (ClassNotFoundException cnfe) {
- // ignore
+ // ignore
}
}
if (testClass == null) {
@@ -141,4 +141,4 @@ public class TearDownOnVmCrash implements JUnitResultFormatter {
+ " tearDown: " + t.getMessage());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
index 159026d..416c10d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
@@ -113,17 +113,17 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
}
/** {@inheritDoc}. */
- public void setOutput(final OutputStream out) {
+ public void setOutput(final OutputStream out) {
this.out = out;
}
/** {@inheritDoc}. */
- public void setSystemOutput(final String out) {
+ public void setSystemOutput(final String out) {
formatOutput(SYSTEM_OUT, out);
}
/** {@inheritDoc}. */
- public void setSystemError(final String out) {
+ public void setSystemError(final String out) {
formatOutput(SYSTEM_ERR, out);
}
@@ -131,7 +131,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
* The whole testsuite started.
* @param suite the testsuite.
*/
- public void startTestSuite(final JUnitTest suite) {
+ public void startTestSuite(final JUnitTest suite) {
doc = getDocumentBuilder().newDocument();
rootElement = doc.createElement(TESTSUITE);
final String n = suite.getName();
@@ -172,7 +172,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
hostname = localHost.getHostName();
}
} catch (final UnknownHostException e) {
- // fall back to default 'localhost'
+ // fall back to default 'localhost'
}
return hostname;
}
@@ -182,7 +182,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
* @param suite the testsuite.
* @throws BuildException on error.
*/
- public void endTestSuite(final JUnitTest suite) throws BuildException {
+ public void endTestSuite(final JUnitTest suite) throws BuildException {
rootElement.setAttribute(ATTR_TESTS, "" + suite.runCount());
rootElement.setAttribute(ATTR_FAILURES, "" + suite.failureCount());
rootElement.setAttribute(ATTR_ERRORS, "" + suite.errorCount());
@@ -218,13 +218,13 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
* <p>A new Test is started.
* @param t the test.
*/
- public void startTest(final Test t) {
+ public void startTest(final Test t) {
testStarts.put(createDescription(t), System.currentTimeMillis());
}
private static String createDescription(final Test test) throws BuildException {
return JUnitVersionHelper.getTestCaseName(test) + "(" + JUnitVersionHelper.getTestCaseClassName(test) + ")";
- }
+ }
/**
* Interface TestListener.
@@ -232,7 +232,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
* <p>A Test is finished.
* @param test the test.
*/
- public void endTest(final Test test) {
+ public void endTest(final Test test) {
final String testDescription = createDescription(test);
// Fix for bug #5637 - if a junit.extensions.TestSetup is
@@ -280,7 +280,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
* @param test the test.
* @param t the assertion.
*/
- public void addFailure(final Test test, final AssertionFailedError t) {
+ public void addFailure(final Test test, final AssertionFailedError t) {
addFailure(test, (Throwable) t);
}
@@ -291,7 +291,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
* @param test the test.
* @param t the error.
*/
- public void addError(final Test test, final Throwable t) {
+ public void addError(final Test test, final Throwable t) {
formatError(ERROR, test, t);
}
@@ -328,7 +328,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
nested.appendChild(doc.createCDATASection(output));
}
- public void testIgnored(final Test test) {
+ public void testIgnored(final Test test) {
formatSkip(test, JUnitVersionHelper.getIgnoreMessage(test));
if (test != null) {
ignoredTests.put(createDescription(test), test);
@@ -358,7 +358,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
}
- public void testAssumptionFailure(final Test test, final Throwable failure) {
+ public void testAssumptionFailure(final Test test, final Throwable failure) {
formatSkip(test, failure.getMessage());
skippedTests.put(createDescription(test), test);
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
index ff3a940..3a73bdf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
@@ -72,7 +72,7 @@ public class SplashTask extends Task {
* Use org.apache.tools.ant.taskdefs.optional.net.SetProxy
*/
@Deprecated
- public void setUseproxy(boolean useProxy) {
+ public void setUseproxy(boolean useProxy) {
this.useProxy = useProxy;
}
@@ -83,7 +83,7 @@ public class SplashTask extends Task {
* Use org.apache.tools.ant.taskdefs.optional.net.SetProxy
*/
@Deprecated
- public void setProxy(String proxy) {
+ public void setProxy(String proxy) {
this.proxy = proxy;
}
@@ -94,7 +94,7 @@ public class SplashTask extends Task {
* Use org.apache.tools.ant.taskdefs.optional.net.SetProxy
*/
@Deprecated
- public void setPort(String port) {
+ public void setPort(String port) {
this.port = port;
}
@@ -105,7 +105,7 @@ public class SplashTask extends Task {
* Use org.apache.tools.ant.taskdefs.optional.net.SetProxy
*/
@Deprecated
- public void setUser(String user) {
+ public void setUser(String user) {
this.user = user;
}
@@ -116,7 +116,7 @@ public class SplashTask extends Task {
* Use org.apache.tools.ant.taskdefs.optional.net.SetProxy
*/
@Deprecated
- public void setPassword(String password) {
+ public void setPassword(String password) {
this.password = password;
}
@@ -158,7 +158,7 @@ public class SplashTask extends Task {
* @throws BuildException on error
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
if (splash != null) {
splash.setVisible(false);
getProject().removeBuildListener(splash);
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
index 3dea1d8..b5088a7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
@@ -135,7 +135,7 @@ public class Directory {
* @return true if this object has an equal directory field as the other object
*/
@Override
- public boolean equals(Object obj) {
+ public boolean equals(Object obj) {
if (obj == this) {
return true;
}
@@ -154,7 +154,7 @@ public class Directory {
* @return the hash code of the directory field
*/
@Override
- public int hashCode() {
+ public int hashCode() {
return directory.hashCode();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
index bd98b3a..68419a8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
@@ -198,15 +198,15 @@ public abstract class SSHBase extends Task implements LogListener {
protected Session openSession() throws JSchException {
final JSch jsch = new JSch();
final SSHBase base = this;
- if(verbose) {
- JSch.setLogger(new com.jcraft.jsch.Logger(){
- public boolean isEnabled(final int level){
- return true;
- }
- public void log(final int level, final String message){
- base.log(message, Project.MSG_INFO);
- }
- });
+ if (verbose) {
+ JSch.setLogger(new com.jcraft.jsch.Logger(){
+ public boolean isEnabled(final int level){
+ return true;
+ }
+ public void log(final int level, final String message){
+ base.log(message, Project.MSG_INFO);
+ }
+ });
}
if (null != userInfo.getKeyfile()) {
jsch.addIdentity(userInfo.getKeyfile());
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
index 0fd252e..b9cbc30 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
@@ -275,7 +275,7 @@ public class SSHExec extends SSHBase {
* @exception BuildException Most likely a network error or bad parameter.
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
if (getHost() == null) {
throw new BuildException("Host is required.");
@@ -401,7 +401,7 @@ public class SSHExec extends SSHBase {
thread =
new Thread() {
@Override
- public void run() {
+ public void run() {
while (!channel.isClosed()) {
if (thread == null) {
return;
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
index 15d7b7e..e9f2675 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
@@ -133,7 +133,7 @@ public class SSHSession extends SSHBase {
* network error or bad parameter.
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
if (getHost() == null) {
throw new BuildException("Host is required.");
}
@@ -238,19 +238,19 @@ public class SSHSession extends SSHBase {
public void setRPort(final int rport) { this.rport = rport; }
public int getLPort() {
if (lport == 0) {
- throw new BuildException("lport is required for LocalTunnel.");
+ throw new BuildException("lport is required for LocalTunnel.");
}
return lport;
}
public String getRHost() {
if (rhost == null) {
- throw new BuildException("rhost is required for LocalTunnel.");
+ throw new BuildException("rhost is required for LocalTunnel.");
}
return rhost;
}
public int getRPort() {
if (rport == 0) {
- throw new BuildException("rport is required for LocalTunnel.");
+ throw new BuildException("rport is required for LocalTunnel.");
}
return rport;
}
@@ -266,28 +266,28 @@ public class SSHSession extends SSHBase {
public void setLHost(final String lhost) { this.lhost = lhost; }
public void setRPort(final int rport) {
final Integer portKey = new Integer(rport);
- if (remotePortsUsed.contains(portKey)) {
- throw new BuildException("Multiple remote tunnels defined to"
- + " use same remote port " + rport);
- }
+ if (remotePortsUsed.contains(portKey)) {
+ throw new BuildException("Multiple remote tunnels defined to"
+ + " use same remote port " + rport);
+ }
remotePortsUsed.add(portKey);
this.rport = rport;
}
public int getLPort() {
if (lport == 0) {
- throw new BuildException("lport is required for RemoteTunnel.");
+ throw new BuildException("lport is required for RemoteTunnel.");
}
return lport;
}
public String getLHost() {
if (lhost == null) {
- throw new BuildException("lhost is required for RemoteTunnel.");
+ throw new BuildException("lhost is required for RemoteTunnel.");
}
return lhost;
}
public int getRPort() {
if (rport == 0) {
- throw new BuildException("rport is required for RemoteTunnel.");
+ throw new BuildException("rport is required for RemoteTunnel.");
}
return rport;
}
@@ -318,7 +318,7 @@ public class SSHSession extends SSHBase {
*
* @param task an unknown element.
*/
- public void addTask(final Task task) {
+ public void addTask(final Task task) {
nested.add(task);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
index 9676467..66c9b81 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -123,7 +123,7 @@ public class Scp extends SSHBase {
* @since Ant 1.8.0
*/
public void setPreservelastmodified(final boolean yesOrNo) {
- this.preserveLastModified = yesOrNo;
+ this.preserveLastModified = yesOrNo;
}
/**
@@ -139,13 +139,13 @@ public class Scp extends SSHBase {
}
private static void validateRemoteUri(final String type, final String aToUri) {
- if (!isRemoteUri(aToUri)) {
+ if (!isRemoteUri(aToUri)) {
throw new BuildException(type + " '" + aToUri + "' is invalid. "
+ "The 'remoteToDir' attribute must "
+ "have syntax like the "
+ "following: user:password@host:/path"
+ " - the :password part is optional");
- }
+ }
}
/**
@@ -198,7 +198,7 @@ public class Scp extends SSHBase {
* @throws BuildException on error
*/
@Override
- public void init() throws BuildException {
+ public void init() throws BuildException {
super.init();
this.toUri = null;
this.fromUri = null;
@@ -210,7 +210,7 @@ public class Scp extends SSHBase {
* @throws BuildException on error
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
if (toUri == null) {
throw exactlyOne(TO_ATTRS);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
index 0cc9970..44b058d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
@@ -229,8 +229,8 @@ public class ScpFromMessage extends AbstractSshMessage {
}
private void fetchFile(final File localFile,
- long filesize,
- final OutputStream out,
+ long filesize,
+ final OutputStream out,
final InputStream in)
throws IOException, JSchException {
final byte[] buf = new byte[BUFFER_SIZE];
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
index cc52059..ad9aee8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
@@ -130,7 +130,7 @@ public class Symlink extends DispatchTask {
* @throws BuildException on error.
*/
@Override
- public void init() throws BuildException {
+ public void init() throws BuildException {
super.init();
setDefaults();
}
@@ -140,7 +140,7 @@ public class Symlink extends DispatchTask {
* @throws BuildException on error.
*/
@Override
- public synchronized void execute() throws BuildException {
+ public synchronized void execute() throws BuildException {
if (executing) {
throw new BuildException(
"Infinite recursion detected in Symlink.execute()");
@@ -328,7 +328,7 @@ public class Symlink extends DispatchTask {
* @param action The action to perform.
*/
@Override
- public void setAction(String action) {
+ public void setAction(String action) {
super.setAction(action);
}
@@ -387,7 +387,7 @@ public class Symlink extends DispatchTask {
* instead
*/
@Deprecated
- public static void deleteSymlink(String path)
+ public static void deleteSymlink(String path)
throws IOException, FileNotFoundException {
SYMLINK_UTILS.deleteSymbolicLink(new File(path), null);
}
@@ -421,7 +421,7 @@ public class Symlink extends DispatchTask {
* instead
*/
@Deprecated
- public static void deleteSymlink(File linkfil)
+ public static void deleteSymlink(File linkfil)
throws IOException {
SYMLINK_UTILS.deleteSymbolicLink(linkfil, null);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/types/FilterChain.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/FilterChain.java b/src/main/org/apache/tools/ant/types/FilterChain.java
index a848ce7..b495a5a 100644
--- a/src/main/org/apache/tools/ant/types/FilterChain.java
+++ b/src/main/org/apache/tools/ant/types/FilterChain.java
@@ -375,7 +375,7 @@ public class FilterChain extends DataType
* @exception BuildException if this instance already has been configured.
*/
@Override
- public void setRefid(Reference r) throws BuildException {
+ public void setRefid(Reference r) throws BuildException {
if (!filterReaders.isEmpty()) {
throw tooManyAttributes();
}
@@ -398,7 +398,7 @@ public class FilterChain extends DataType
}
@Override
- protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
+ protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
throws BuildException {
if (isChecked()) {
return;
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/types/FilterSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index b853dd1..2c1f2e7 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -165,7 +165,7 @@ public class FilterSet extends DataType implements Cloneable {
//inherit doc
/** {@inheritDoc}. */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return VALUES;
}
}
@@ -494,7 +494,7 @@ public class FilterSet extends DataType implements Cloneable {
* @throws BuildException if the clone cannot be performed.
*/
@Override
- public synchronized Object clone() throws BuildException {
+ public synchronized Object clone() throws BuildException {
if (isReference()) {
return getRef().clone();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/types/Permissions.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Permissions.java b/src/main/org/apache/tools/ant/types/Permissions.java
index 1036338..96da71b 100644
--- a/src/main/org/apache/tools/ant/types/Permissions.java
+++ b/src/main/org/apache/tools/ant/types/Permissions.java
@@ -186,7 +186,7 @@ public class Permissions {
* @param status The exit status requested.
*/
@Override
- public void checkExit(final int status) {
+ public void checkExit(final int status) {
final java.security.Permission perm = new java.lang.RuntimePermission("exitVM", null);
try {
checkPermission(perm);
@@ -202,7 +202,7 @@ public class Permissions {
* @param perm The permission requested.
*/
@Override
- public void checkPermission(final java.security.Permission perm) {
+ public void checkPermission(final java.security.Permission perm) {
if (active) {
if (delegateToOldSM && !perm.getName().equals("exitVM")) {
boolean permOK = false;
@@ -349,7 +349,7 @@ public class Permissions {
* @return string description of the permissions.
*/
@Override
- public String toString() {
+ public String toString() {
return ("Permission: " + className + " (\"" + name + "\", \"" + actions + "\")");
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
index 4684a9f..b9e7cfb 100644
--- a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
+++ b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
@@ -46,18 +46,18 @@ public class CutDirsMapper implements FileNameMapper {
* Empty implementation.
* @param ignore ignored.
*/
- public void setFrom(final String ignore) {
+ public void setFrom(final String ignore) {
}
/**
* Empty implementation.
* @param ignore ignored.
*/
- public void setTo(final String ignore) {
+ public void setTo(final String ignore) {
}
/** {@inheritDoc}. */
- public String[] mapFileName(final String sourceFileName) {
+ public String[] mapFileName(final String sourceFileName) {
if (dirs <= 0) {
throw new BuildException("dirs must be set to a positive number");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/types/resources/Archives.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/Archives.java b/src/main/org/apache/tools/ant/types/resources/Archives.java
index d7b3127..4b0d51c 100644
--- a/src/main/org/apache/tools/ant/types/resources/Archives.java
+++ b/src/main/org/apache/tools/ant/types/resources/Archives.java
@@ -72,7 +72,7 @@ public class Archives extends DataType
/**
* Sums the sizes of nested archives.
*/
- public int size() {
+ public int size() {
if (isReference()) {
return ((Archives) getCheckedRef()).size();
}
@@ -87,7 +87,7 @@ public class Archives extends DataType
/**
* Merges the nested collections.
*/
- public Iterator<Resource> iterator() {
+ public Iterator<Resource> iterator() {
if (isReference()) {
return ((Archives) getCheckedRef()).iterator();
}
@@ -103,7 +103,7 @@ public class Archives extends DataType
/**
* @return false
*/
- public boolean isFilesystemOnly() {
+ public boolean isFilesystemOnly() {
if (isReference()) {
return ((Archives) getCheckedRef()).isFilesystemOnly();
}
@@ -116,7 +116,7 @@ public class Archives extends DataType
* @param r the Reference to set.
*/
@Override
- public void setRefid(final Reference r) {
+ public void setRefid(final Reference r) {
if (zips.getResourceCollections().size() > 0
|| tars.getResourceCollections().size() > 0) {
throw tooManyAttributes();
@@ -130,7 +130,7 @@ public class Archives extends DataType
* @return a cloned instance.
*/
@Override
- public Object clone() {
+ public Object clone() {
try {
final Archives a = (Archives) super.clone();
a.zips = (Union) zips.clone();
@@ -177,7 +177,7 @@ public class Archives extends DataType
* @throws BuildException on error.
*/
@Override
- protected synchronized void dieOnCircularReference(final Stack<Object> stk, final Project p)
+ protected synchronized void dieOnCircularReference(final Stack<Object> stk, final Project p)
throws BuildException {
if (isChecked()) {
return;
@@ -191,4 +191,4 @@ public class Archives extends DataType
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java b/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java
index d73193f..79445bf 100644
--- a/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java
@@ -56,7 +56,7 @@ public abstract class ContentTransformingResource extends ResourceDecorator {
* compatibility with java.io.File), or UNKNOWN_SIZE if not known.
*/
@Override
- public long getSize() {
+ public long getSize() {
if (isExists()) {
InputStream in = null;
try {
@@ -88,7 +88,7 @@ public abstract class ContentTransformingResource extends ResourceDecorator {
* supported for this Resource type.
*/
@Override
- public InputStream getInputStream() throws IOException {
+ public InputStream getInputStream() throws IOException {
InputStream in = getResource().getInputStream();
if (in != null) {
in = wrapStream(in);
@@ -105,7 +105,7 @@ public abstract class ContentTransformingResource extends ResourceDecorator {
* supported for this Resource type.
*/
@Override
- public OutputStream getOutputStream() throws IOException {
+ public OutputStream getOutputStream() throws IOException {
OutputStream out = getResource().getOutputStream();
if (out != null) {
out = wrapStream(out);
@@ -117,14 +117,14 @@ public abstract class ContentTransformingResource extends ResourceDecorator {
* Suppress FileProvider, re-implement Appendable
*/
@Override
- public <T> T as(final Class<T> clazz) {
+ public <T> T as(final Class<T> clazz) {
if (Appendable.class.isAssignableFrom(clazz)) {
if (isAppendSupported()) {
final Appendable a =
getResource().as(Appendable.class);
if (a != null) {
return clazz.cast(new Appendable() {
- public OutputStream getAppendOutputStream()
+ public OutputStream getAppendOutputStream()
throws IOException {
OutputStream out = a.getAppendOutputStream();
if (out != null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java
index bea172a..4f9acd3 100644
--- a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java
+++ b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java
@@ -37,7 +37,7 @@ public class LazyResourceCollectionWrapper extends
private FilteringIterator filteringIterator;
@Override
- protected Iterator<Resource> createIterator() {
+ protected Iterator<Resource> createIterator() {
Iterator<Resource> iterator;
if (isCache()) {
if (filteringIterator == null) {
@@ -53,7 +53,7 @@ public class LazyResourceCollectionWrapper extends
}
@Override
- protected int getSize() {
+ protected int getSize() {
// to compute the size, just iterate: the iterator will take care of
// caching
final Iterator<Resource> it = createIterator();
@@ -88,7 +88,7 @@ public class LazyResourceCollectionWrapper extends
this.it = it;
}
- public boolean hasNext() {
+ public boolean hasNext() {
if (ended) {
return false;
}
@@ -105,7 +105,7 @@ public class LazyResourceCollectionWrapper extends
return true;
}
- public Resource next() {
+ public Resource next() {
if (!hasNext()) {
throw new UnsupportedOperationException();
}
@@ -114,7 +114,7 @@ public class LazyResourceCollectionWrapper extends
return r;
}
- public void remove() {
+ public void remove() {
throw new UnsupportedOperationException();
}
}
@@ -140,7 +140,7 @@ public class LazyResourceCollectionWrapper extends
this.it = it;
}
- public boolean hasNext() {
+ public boolean hasNext() {
synchronized (cachedResources) {
// have we already cached the next entry ?
if (cachedResources.size() > cusrsor) {
@@ -157,7 +157,7 @@ public class LazyResourceCollectionWrapper extends
return true;
}
- public Resource next() {
+ public Resource next() {
// first check that we have some to deliver
if (!hasNext()) {
throw new NoSuchElementException();
@@ -169,7 +169,7 @@ public class LazyResourceCollectionWrapper extends
}
}
- public void remove() {
+ public void remove() {
throw new UnsupportedOperationException();
}
}