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 2017/12/18 05:31:16 UTC
[05/10] ant git commit: Checkstyle: whitespace,
line continuation and modifier idiosyncrasies
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 bc965e1..987afa7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -103,7 +103,7 @@ public class Zip extends MatchingTask {
protected String archiveType = "zip";
// For directories:
- private static final long EMPTY_CRC = new CRC32 ().getValue ();
+ private static final long EMPTY_CRC = new CRC32().getValue();
protected String emptyBehavior = "skip";
private final Vector<ResourceCollection> resources = new Vector<ResourceCollection>();
protected Hashtable<String, String> addedDirs = new Hashtable<String, String>();
@@ -783,7 +783,7 @@ public class Zip extends MatchingTask {
// temporary file
if (doUpdate) {
if (!renamedFile.delete()) {
- log ("Warning: unable to delete temporary file "
+ log("Warning: unable to delete temporary file "
+ renamedFile.getName(), Project.MSG_WARN);
}
}
@@ -1761,7 +1761,7 @@ public class Zip extends MatchingTask {
addedDirs.put(vPath, vPath);
if (!skipWriting) {
- final ZipEntry ze = new ZipEntry (vPath);
+ final ZipEntry ze = new ZipEntry(vPath);
// ZIPs store time with a granularity of 2 seconds, round up
final int millisToAdd = roundUp ? ROUNDUP_MILLIS : 0;
@@ -1773,10 +1773,10 @@ public class Zip extends MatchingTask {
} else {
ze.setTime(System.currentTimeMillis() + millisToAdd);
}
- ze.setSize (0);
- ze.setMethod (ZipEntry.STORED);
+ ze.setSize(0);
+ ze.setMethod(ZipEntry.STORED);
// This is faintly ridiculous:
- ze.setCrc (EMPTY_CRC);
+ ze.setCrc(EMPTY_CRC);
ze.setUnixMode(mode);
if (extra != null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 7b291f5..1cd5e62 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -433,8 +433,8 @@ public abstract class DefaultCompilerAdapter
cmd.createArgument().setPath(ump);
}
if (attributes.getNativeHeaderDir() != null) {
- if (assumeJava13() || assumeJava14() || assumeJava15()
- || assumeJava16() || assumeJava17()) {
+ if (assumeJava13() || assumeJava14() || assumeJava15() || assumeJava16()
+ || assumeJava17()) {
attributes.log("Support for javac -h has been added in Java8,"
+ " ignoring it");
} else {
@@ -485,8 +485,7 @@ public abstract class DefaultCompilerAdapter
* @param cmd the command line
*/
protected void logAndAddFilesToCompile(final Commandline cmd) {
- attributes.log("Compilation " + cmd.describeArguments(),
- Project.MSG_VERBOSE);
+ attributes.log("Compilation " + cmd.describeArguments(), Project.MSG_VERBOSE);
final StringBuffer niceSourceList = new StringBuffer("File");
if (compileList.length != 1) {
@@ -728,10 +727,10 @@ public abstract class DefaultCompilerAdapter
return "javac1.9".equals(attributes.getCompilerVersion())
|| "javac9".equals(attributes.getCompilerVersion())
|| "javac10+".equals(attributes.getCompilerVersion())
- || (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9) &&
- ("classic".equals(attributes.getCompilerVersion())
- || "modern".equals(attributes.getCompilerVersion())
- || "extJavac".equals(attributes.getCompilerVersion())));
+ || (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)
+ && ("classic".equals(attributes.getCompilerVersion())
+ || "modern".equals(attributes.getCompilerVersion())
+ || "extJavac".equals(attributes.getCompilerVersion())));
}
/**
@@ -740,8 +739,8 @@ public abstract class DefaultCompilerAdapter
*/
private boolean assumeJavaXY(final String javacXY, final String javaEnvVersionXY) {
return javacXY.equals(attributes.getCompilerVersion())
- || (JavaEnvUtils.isJavaVersion(javaEnvVersionXY) &&
- ("classic".equals(attributes.getCompilerVersion())
+ || (JavaEnvUtils.isJavaVersion(javaEnvVersionXY)
+ && ("classic".equals(attributes.getCompilerVersion())
|| "modern".equals(attributes.getCompilerVersion())
|| "extJavac".equals(attributes.getCompilerVersion())));
}
@@ -830,8 +829,7 @@ public abstract class DefaultCompilerAdapter
t = t.substring(2);
}
return t.equals("1") || t.equals("2") || t.equals("3") || t.equals("4")
- || ((t.equals("5") || t.equals("6"))
- && !assumeJava15() && !assumeJava16())
+ || ((t.equals("5") || t.equals("6")) && !assumeJava15() && !assumeJava16())
|| (t.equals("7") && !assumeJava17())
|| (t.equals("8") && !assumeJava18())
|| (t.equals("9") && !assumeJava9Plus());
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
index 3167cc2..a665e47 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
@@ -142,10 +142,9 @@ public class Gcj extends DefaultCompilerAdapter {
int argsLength = 0;
while (!nativeBuild && argsLength < additionalArguments.length) {
int conflictLength = 0;
- while (!nativeBuild
- && conflictLength < CONFLICT_WITH_DASH_C.length) {
- nativeBuild = (additionalArguments[argsLength].startsWith
- (CONFLICT_WITH_DASH_C[conflictLength]));
+ while (!nativeBuild && conflictLength < CONFLICT_WITH_DASH_C.length) {
+ nativeBuild = additionalArguments[argsLength]
+ .startsWith(CONFLICT_WITH_DASH_C[conflictLength]);
conflictLength++;
}
argsLength++;
@@ -153,8 +152,6 @@ public class Gcj extends DefaultCompilerAdapter {
return nativeBuild;
}
- private static final String [] CONFLICT_WITH_DASH_C = {
- "-o" , "--main=", "-D", "-fjni", "-L"
- };
+ private static final String[] CONFLICT_WITH_DASH_C = {"-o", "--main=", "-D", "-fjni", "-L"};
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
index 3fd8ccd..1bb2595 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
@@ -68,7 +68,7 @@ public class Javac12 extends DefaultCompilerAdapter {
new Object[] {cmd.getArguments()});
return ok.booleanValue();
} catch (ClassNotFoundException ex) {
- throw new BuildException("Cannot use classic compiler , as it is "
+ throw new BuildException("Cannot use classic compiler, as it is "
+ "not available. \n"
+ " A common solution is "
+ "to set the environment variable"
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
index acb6a7f..6ca04c5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
@@ -50,7 +50,7 @@ public class Javac13 extends DefaultCompilerAdapter {
// Use reflection to be able to build on all JDKs >= 1.1:
try {
- Class c = Class.forName ("com.sun.tools.javac.Main");
+ Class c = Class.forName("com.sun.tools.javac.Main");
Object compiler = c.newInstance ();
Method compile = c.getMethod ("compile",
new Class [] {(new String [] {}).getClass ()});
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
index 0958c2d..c163ad7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.condition;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
+import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Locale;
@@ -115,7 +116,7 @@ public class Http extends ProjectComponent implements Condition {
}
return false;
}
- } catch (java.net.ProtocolException pe) {
+ } catch (ProtocolException pe) {
throw new BuildException("Invalid HTTP protocol: "
+ requestMethod, pe);
} catch (java.io.IOException e) {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java
index a8bdbba..ac05478 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java
@@ -161,7 +161,7 @@ public class IsLastModified extends ProjectComponent implements Condition {
long expected = getMillis();
long actual = resource.getLastModified();
log("expected timestamp: " + expected + " (" + new Date(expected) + ")"
- + ", actual timestamp: " + actual + " (" + new Date(actual) + ")" ,
+ + ", actual timestamp: " + actual + " (" + new Date(actual) + ")",
Project.MSG_VERBOSE);
if (CompareMode.EQUALS_TEXT.equals(mode.getValue())) {
return expected == actual;
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/email/Message.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Message.java b/src/main/org/apache/tools/ant/taskdefs/email/Message.java
index c121f5d..8869ef1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/Message.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/Message.java
@@ -165,7 +165,7 @@ public class Message extends ProjectComponent {
* @since Ant 1.6
*/
public void setCharset(String charset) {
- this.charset = charset;
+ this.charset = charset;
}
/**
* Returns the charset of mail message.
@@ -174,7 +174,7 @@ public class Message extends ProjectComponent {
* @since Ant 1.6
*/
public String getCharset() {
- return charset;
+ return charset;
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/launcher/Java13CommandLauncher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/launcher/Java13CommandLauncher.java b/src/main/org/apache/tools/ant/taskdefs/launcher/Java13CommandLauncher.java
index e022ade..12ec7d9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/launcher/Java13CommandLauncher.java
+++ b/src/main/org/apache/tools/ant/taskdefs/launcher/Java13CommandLauncher.java
@@ -56,9 +56,9 @@ public class Java13CommandLauncher extends CommandLauncher {
Project.MSG_DEBUG);
}
return Runtime.getRuntime().exec(cmd, env, workingDir);
- } catch(IOException ioex) {
+ } catch (IOException ioex) {
throw ioex;
- } catch(Exception exc) {
+ } catch (Exception exc) {
// IllegalAccess, IllegalArgument, ClassCast
throw new BuildException("Unable to execute command", exc);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java b/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java
index 4c1b3f0..b7c914c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java
+++ b/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java
@@ -80,9 +80,7 @@ public class VmsCommandLauncher extends Java13CommandLauncher {
public Process exec(Project project, String[] cmd, String[] env,
File workingDir) throws IOException {
File cmdFile = createCommandFile(cmd, env);
- Process p = super.exec(project, new String[] {
- cmdFile.getPath()
- }, env, workingDir);
+ Process p = super.exec(project, new String[] {cmdFile.getPath()}, env, workingDir);
deleteAfter(cmdFile, p);
return p;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
index 11c091a..7e71aed 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
@@ -264,8 +264,7 @@ public class Cab extends MatchingTask {
try {
Process p = Execute.launch(getProject(),
new String[] {"listcab"}, null,
- baseDir != null ? baseDir
- : getProject().getBaseDir(),
+ baseDir != null ? baseDir : getProject().getBaseDir(),
true);
OutputStream out = p.getOutputStream();
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
index 141ed17..8a0a9e1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
@@ -243,7 +243,7 @@ public class EchoProperties extends Task {
* The values are "xml" and "text".
*/
public static class FormatAttribute extends EnumeratedAttribute {
- private String [] formats = new String[]{"xml", "text"};
+ private String[] formats = new String[] {"xml", "text"};
/**
* @see EnumeratedAttribute#getValues()
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
index bf2d679..e9753df 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
@@ -467,11 +467,9 @@ public class Javah extends Task {
classpath = classpath.concatSystemClasspath("ignore");
}
- JavahAdapter ad =
- nestedAdapter != null ? nestedAdapter :
- JavahAdapterFactory.getAdapter(facade.getImplementation(),
- this,
- createImplementationClasspath());
+ JavahAdapter ad = nestedAdapter != null ? nestedAdapter
+ : JavahAdapterFactory.getAdapter(facade.getImplementation(), this,
+ createImplementationClasspath());
if (!ad.compile(this)) {
throw new BuildException("compilation failed");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
index 2221e39..664e574 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
@@ -294,11 +294,9 @@ public class Native2Ascii extends MatchingTask {
}
log("converting " + srcName, Project.MSG_VERBOSE);
- Native2AsciiAdapter ad =
- nestedAdapter != null ? nestedAdapter :
- Native2AsciiAdapterFactory.getAdapter(facade.getImplementation(),
- this,
- createImplementationClasspath());
+ Native2AsciiAdapter ad = nestedAdapter != null ? nestedAdapter
+ : Native2AsciiAdapterFactory.getAdapter(facade.getImplementation(), this,
+ createImplementationClasspath());
if (!ad.convert(this, srcFile, destFile)) {
throw new BuildException("conversion failed");
}
@@ -324,8 +322,7 @@ public class Native2Ascii extends MatchingTask {
public String[] mapFileName(String fileName) {
int lastDot = fileName.lastIndexOf('.');
if (lastDot >= 0) {
- return new String[] {fileName.substring(0, lastDot)
- + extension};
+ return new String[] {fileName.substring(0, lastDot) + extension};
} else {
return new String[] {fileName + extension};
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
index 3f85ed7..a8aec7b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -1023,7 +1023,7 @@ public class NetRexxC extends MatchingTask {
public static class TraceAttr extends EnumeratedAttribute {
/** {@inheritDoc}. */
public String[] getValues() {
- return new String[]{"trace", "trace1", "trace2", "notrace"};
+ return new String[] {"trace", "trace1", "trace2", "notrace"};
}
}
@@ -1033,9 +1033,8 @@ public class NetRexxC extends MatchingTask {
public static class VerboseAttr extends EnumeratedAttribute {
/** {@inheritDoc}. */
public String[] getValues() {
- return new String[]{"verbose", "verbose0", "verbose1",
- "verbose2", "verbose3", "verbose4",
- "verbose5", "noverbose"};
+ return new String[] {"verbose", "verbose0", "verbose1", "verbose2",
+ "verbose3", "verbose4", "verbose5", "noverbose"};
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 f9f317c..71f2841 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -298,14 +298,14 @@ public class PropertyFile extends Task {
private static final String DEFAULT_DATE_VALUE = "now";
private static final String DEFAULT_STRING_VALUE = "";
- private String key = null;
- private int type = Type.STRING_TYPE;
- private int operation = Operation.EQUALS_OPER;
- private String value = null;
- private String defaultValue = null;
- private String newValue = null;
- private String pattern = null;
- private int field = Calendar.DATE;
+ private String key = null;
+ private int type = Type.STRING_TYPE;
+ private int operation = Operation.EQUALS_OPER;
+ private String value = null;
+ private String defaultValue = null;
+ private String newValue = null;
+ private String pattern = null;
+ private int field = Calendar.DATE;
/**
* Name of the property name/value pair
@@ -404,8 +404,7 @@ public class PropertyFile extends Task {
} else if (type == Type.STRING_TYPE) {
executeString(oldValue);
} else {
- throw new BuildException("Unknown operation type: "
- + type);
+ throw new BuildException("Unknown operation type: " + type);
}
} catch (NullPointerException npe) {
// Default to string type
@@ -615,13 +614,13 @@ public class PropertyFile extends Task {
// Property type operations
/** + */
- public static final int INCREMENT_OPER = 0;
+ public static final int INCREMENT_OPER = 0;
/** - */
- public static final int DECREMENT_OPER = 1;
+ public static final int DECREMENT_OPER = 1;
/** = */
- public static final int EQUALS_OPER = 2;
+ public static final int EQUALS_OPER = 2;
/** del */
- public static final int DELETE_OPER = 3;
+ public static final int DELETE_OPER = 3;
/** {@inheritDoc}. */
@Override
@@ -653,11 +652,11 @@ public class PropertyFile extends Task {
// Property types
/** int */
- public static final int INTEGER_TYPE = 0;
+ public static final int INTEGER_TYPE = 0;
/** date */
- public static final int DATE_TYPE = 1;
+ public static final int DATE_TYPE = 1;
/** string */
- public static final int STRING_TYPE = 2;
+ public static final int STRING_TYPE = 2;
/** {@inheritDoc} */
@Override
@@ -697,9 +696,8 @@ public class PropertyFile extends Task {
private static final String MONTH = "month";
private static final String YEAR = "year";
- private static final String[] UNITS
- = {MILLISECOND, SECOND, MINUTE, HOUR,
- DAY, WEEK, MONTH, YEAR };
+ private static final String[] UNITS = {MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH,
+ YEAR};
private Map calendarFields = new HashMap();
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
index d58238b..a816f6e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
@@ -114,9 +114,8 @@ public class Rpm extends Task {
Commandline toExecute = new Commandline();
- toExecute.setExecutable(rpmBuildCommand == null
- ? guessRpmBuildCommand()
- : rpmBuildCommand);
+ toExecute.setExecutable(rpmBuildCommand == null ? guessRpmBuildCommand()
+ : rpmBuildCommand);
if (topDir != null) {
toExecute.createArgument().setValue("--define");
toExecute.createArgument().setValue("_topdir " + topDir);
@@ -169,7 +168,7 @@ public class Rpm extends Task {
fos = new FileOutputStream(error);
BufferedOutputStream bos = new BufferedOutputStream(fos);
errorstream = new PrintStream(bos);
- } catch (IOException e) {
+ } catch (IOException e) {
FileUtils.close(fos);
throw new BuildException(e, getLocation());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
index 4eefaeb..99694f6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
@@ -253,12 +253,11 @@ public class BorlandDeploymentTool extends GenericDeploymentTool
File borlandDD = new File(getConfig().descriptorDir, ddPrefix + dd);
if (borlandDD.exists()) {
log("Borland specific file found " + borlandDD, Project.MSG_VERBOSE);
- ejbFiles.put(META_DIR + dd , borlandDD);
+ ejbFiles.put(META_DIR + dd, borlandDD);
} else {
log("Unable to locate borland deployment descriptor. "
+ "It was expected to be in "
+ borlandDD.getPath(), Project.MSG_WARN);
- return;
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
index ac2aa72..9ae0e67 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
@@ -29,6 +29,7 @@ import java.util.Hashtable;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.xml.sax.AttributeList;
+import org.xml.sax.HandlerBase;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -40,7 +41,7 @@ import org.xml.sax.SAXException;
* inserted into an EJB jar as to a File representing the file on disk. This
* list can then be accessed through the getFiles() method.
*/
-public class DescriptorHandler extends org.xml.sax.HandlerBase {
+public class DescriptorHandler extends HandlerBase {
private static final int DEFAULT_HASH_TABLE_SIZE = 10;
private static final int STATE_LOOKING_EJBJAR = 1;
private static final int STATE_IN_EJBJAR = 2;
@@ -220,7 +221,7 @@ public class DescriptorHandler extends org.xml.sax.HandlerBase {
}
}
- owningTask.log("Could not resolve ( publicId: " + publicId
+ owningTask.log("Could not resolve (publicId: " + publicId
+ ", systemId: " + systemId + ") to a local entity", Project.MSG_INFO);
return null;
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index 964a455..3329a8b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -790,7 +790,7 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
manifest = new Manifest(in);
} catch (IOException e) {
- throw new BuildException ("Unable to read manifest", e, getLocation());
+ throw new BuildException("Unable to read manifest", e, getLocation());
} finally {
if (in != null) {
in.close();
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
index ee5dc85..9aca1cb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
@@ -114,7 +114,7 @@ public class IPlanetEjbcTask extends Task {
* @param iasdescriptor The name and location of the iAS-specific EJB
* descriptor.
*/
- public void setIasdescriptor (File iasdescriptor) {
+ public void setIasdescriptor(File iasdescriptor) {
this.iasdescriptor = iasdescriptor;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
index 81fe805..d474f8b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
@@ -587,7 +587,7 @@ public class JonasDeploymentTool extends GenericDeploymentTool {
log("Cannot find GenIC class in classpath.", Project.MSG_ERR);
throw new BuildException("GenIC class not found, please check the classpath.");
} else {
- log("Using '" + genicClass + "' GenIC class." , Project.MSG_VERBOSE);
+ log("Using '" + genicClass + "' GenIC class.", Project.MSG_VERBOSE);
genicTask.setClassname(genicClass);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
index 02d646e..a737803 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
@@ -46,7 +46,7 @@ public class OrionDeploymentTool extends GenericDeploymentTool {
* @param baseName String
*/
protected void addVendorFiles(Hashtable ejbFiles, String baseName) {
- String ddPrefix = (usingBaseJarName() ? "" : baseName );
+ String ddPrefix = usingBaseJarName() ? "" : baseName;
File orionDD = new File(getConfig().descriptorDir, ddPrefix + ORION_DD);
if (orionDD.exists()) {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java
index b3cfddc..4befa4f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java
@@ -172,7 +172,7 @@ public class ExtensionAdapter extends DataType {
}
/**
- * Convert this adpater object into an extension object.
+ * Convert this adapter object into an extension object.
*
* @return the extension object
*/
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
index 8641a77..108d2e2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
@@ -239,7 +239,7 @@ public class Image extends MatchingTask {
final String dstName = dstNames[j];
final File dstFile = new File(dstDir, dstName).getAbsoluteFile();
- if (dstFile.exists()){
+ if (dstFile.exists()) {
// avoid overwriting unless necessary
if(!overwrite
&& srcFile.lastModified() <= dstFile.lastModified()) {
@@ -252,7 +252,7 @@ public class Image extends MatchingTask {
}
// avoid extra work while overwriting
- if (!srcFile.equals(dstFile)){
+ if (!srcFile.equals(dstFile)) {
dstFile.delete();
}
}
@@ -317,7 +317,7 @@ public class Image extends MatchingTask {
+ dstParent);
}
- if ((overwrite && newFile.exists()) && (!newFile.equals(file))) {
+ if (overwrite && newFile.exists() && !newFile.equals(file)) {
newFile.delete();
}
@@ -333,7 +333,7 @@ public class Image extends MatchingTask {
FileUtils.close(stream);
}
} catch (IOException err) {
- if (!file.equals(newFile)){
+ if (!file.equals(newFile)) {
newFile.delete();
}
if (!failonerror) {
@@ -362,7 +362,7 @@ public class Image extends MatchingTask {
validateAttributes();
try {
- File dest = destDir != null ? destDir : srcDir;
+ File dest = (destDir != null) ? destDir : srcDir;
int writeCount = 0;
@@ -392,9 +392,8 @@ public class Image extends MatchingTask {
writeCount += processDir(fromDir, files, dest, mapper);
}
- if (writeCount>0){
- log("Processed " + writeCount +
- (writeCount == 1 ? " image." : " images."));
+ if (writeCount > 0) {
+ log("Processed " + writeCount + (writeCount == 1 ? " image." : " images."));
}
} catch (Exception err) {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
index 7875ef1..4c7866c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
@@ -53,8 +53,8 @@ public class JonasHotDeploymentTool extends GenericHotDeploymentTool implements
/**
* All the valid actions that weblogic.deploy permits *
*/
- private static final String[] VALID_ACTIONS
- = {ACTION_DELETE, ACTION_DEPLOY, ACTION_LIST, ACTION_UNDEPLOY, ACTION_UPDATE};
+ private static final String[] VALID_ACTIONS = {ACTION_DELETE, ACTION_DEPLOY, ACTION_LIST,
+ ACTION_UNDEPLOY, ACTION_UPDATE};
/**
* Description of the Field
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
index 5157416..acccf9f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
@@ -320,7 +320,7 @@ public class JDependTask extends Task {
* @see EnumeratedAttribute
*/
public static class FormatAttribute extends EnumeratedAttribute {
- private String [] formats = new String[]{"xml", "text"};
+ private String[] formats = new String[] {"xml", "text"};
/**
* @return the enumerated values
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
index 592f423..4cadace 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
@@ -459,7 +459,7 @@ public class JspC extends MatchingTask {
throw new BuildException("srcdir attribute must be set!",
getLocation());
}
- String [] list = src.list();
+ String[] list = src.list();
if (list.length == 0) {
throw new BuildException("srcdir attribute must be set!",
getLocation());
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
index 850c6bc..965f413 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
@@ -67,7 +67,7 @@ public class JspNameMangler implements JspMangler {
* map from a jsp file to a base name; does not deal with extensions
*
* @param jspFile jspFile file
- * @return exensionless potentially remapped name
+ * @return extensionless potentially remapped name
*/
private String mapJspToBaseName(File jspFile) {
String className;
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
index 45a427a..2680847 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
@@ -231,7 +231,7 @@ public class WLJspc extends MatchingTask {
* Set the directory containing the source jsp's
*
*
- * @param dirName the directory containg the source jsp's
+ * @param dirName the directory containing the source jsp's
*/
public void setSrc(File dirName) {
@@ -242,7 +242,7 @@ public class WLJspc extends MatchingTask {
* Set the directory containing the source jsp's
*
*
- * @param dirName the directory containg the source jsp's
+ * @param dirName the directory containing the source jsp's
*/
public void setDest(File dirName) {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
index fd7a321..2c1b13d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
@@ -115,7 +115,7 @@ public class AggregateTransformer {
/**
* Used to ensure the uniqueness of a property
*/
- private volatile static int counter = 0;
+ private static volatile int counter = 0;
/** the format to use for the report. Must be <tt>FRAMES</tt> or <tt>NOFRAMES</tt> */
protected String format = FRAMES;
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java
index 85f1309..24e6c07 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java
@@ -41,7 +41,8 @@ public abstract class BaseTest {
protected String errorProperty;
// CheckStyle:VisibilityModifier ON
- private Object ifCond, unlessCond;
+ private Object ifCond;
+ private Object unlessCond;
private boolean skipNonTests;
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 368c72e..e9bd301 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
@@ -39,8 +39,8 @@ public class Constants {
static final String LOGTESTLISTENEREVENTS = "logtestlistenerevents=";
static final String TESTSFILE = "testsfile=";
static final String TERMINATED_SUCCESSFULLY = "terminated successfully";
- static final String LOG_FAILED_TESTS="logfailedtests=";
+ static final String LOG_FAILED_TESTS = "logfailedtests=";
static final String SKIP_NON_TESTS = "skipNonTests=";
/** @since Ant 1.9.4 */
- static final String THREADID="threadid=";
+ static final String THREADID = "threadid=";
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
index 325f44c..cb1939e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
@@ -135,7 +135,7 @@ public final class DOMUtil {
* the parent is <tt>null</tt> or if a child does not match the
* given name.
*/
- public static Element getChildByTagName (Node parent, String tagname) {
+ public static Element getChildByTagName(Node parent, String tagname) {
if (parent == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
index 69e8f07..e7ffa67 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
@@ -54,8 +54,8 @@ import org.apache.tools.ant.util.StringUtils;
* }
* public static Test suite() {
* TestSuite suite = new TestSuite();
- * suite.addTest( new B("test04") );
- * suite.addTest( new org.D("test10") );
+ * suite.addTest(new B("test04"));
+ * suite.addTest(new org.D("test10"));
* return suite;
* }
* }
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.java
index ae82857..1497151 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.java
@@ -44,7 +44,7 @@ public class IgnoredTestResult extends TestResult {
public synchronized void addListener(TestListener listener) {
if (listener instanceof IgnoredTestListener) {
- listeners.add((IgnoredTestListener)listener);
+ listeners.add((IgnoredTestListener) listener);
}
super.addListener(listener);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 57399fb..dcf66c1 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
@@ -370,8 +370,7 @@ public class JUnitTask extends Task {
*/
@Override
public String[] getValues() {
- return new String[] {"true", "yes", "false", "no",
- "on", "off", "withOutAndErr"};
+ return new String[] {"true", "yes", "false", "no", "on", "off", "withOutAndErr"};
}
/**
@@ -821,23 +820,13 @@ public class JUnitTask extends Task {
mirrorLoader = (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
return new SplitClassLoader(myLoader, path, getProject(),
- new String[] {
- "BriefJUnitResultFormatter",
- "JUnit4TestMethodAdapter",
- "JUnitResultFormatter",
- "JUnitTaskMirrorImpl",
- "JUnitTestRunner",
- "JUnitVersionHelper",
- "OutErrSummaryJUnitResultFormatter",
- "PlainJUnitResultFormatter",
- "SummaryJUnitResultFormatter",
- "TearDownOnVmCrash",
- "XMLJUnitResultFormatter",
- "IgnoredTestListener",
- "IgnoredTestResult",
- "CustomJUnit4TestAdapterCache",
- "TestListenerWrapper"
- });
+ new String[] {"BriefJUnitResultFormatter", "JUnit4TestMethodAdapter",
+ "JUnitResultFormatter", "JUnitTaskMirrorImpl", "JUnitTestRunner",
+ "JUnitVersionHelper", "OutErrSummaryJUnitResultFormatter",
+ "PlainJUnitResultFormatter", "SummaryJUnitResultFormatter",
+ "TearDownOnVmCrash", "XMLJUnitResultFormatter", "IgnoredTestListener",
+ "IgnoredTestResult", "CustomJUnit4TestAdapterCache",
+ "TestListenerWrapper"});
}
});
} else {
@@ -860,9 +849,7 @@ public class JUnitTask extends Task {
final List<List> testLists = new ArrayList<List>();
/* parallel test execution is only supported for multi-process execution */
- final int threads = ((!fork) || (forkMode.getValue().equals(ForkMode.ONCE))
- ? 1
- : this.threads);
+ final int threads = !fork || forkMode.getValue().equals(ForkMode.ONCE) ? 1 : this.threads;
final boolean forkPerTest = forkMode.getValue().equals(ForkMode.PER_TEST);
if (forkPerTest || forkMode.getValue().equals(ForkMode.ONCE)) {
@@ -1002,7 +989,7 @@ public class JUnitTask extends Task {
/* create 1 thread using the passthrough class, and let each thread start */
for (i = 0; i < numThreads; i++) {
- threads[i] = new Thread(new JunitTestThread(this, iter, i+1));
+ threads[i] = new Thread(new JunitTestThread(this, iter, i + 1));
threads[i].start();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java
index 694e1d8..b95e7dc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java
@@ -77,7 +77,7 @@ public interface JUnitTaskMirror {
/** The interface that JUnitResultFormatter extends. */
- public interface JUnitResultFormatterMirror {
+ interface JUnitResultFormatterMirror {
/**
* Set the output stream.
* @param outputStream the stream to use.
@@ -86,7 +86,7 @@ public interface JUnitTaskMirror {
}
/** The interface that SummaryJUnitResultFormatter extends. */
- public interface SummaryJUnitResultFormatterMirror
+ interface SummaryJUnitResultFormatterMirror
extends JUnitResultFormatterMirror {
/**
@@ -97,7 +97,7 @@ public interface JUnitTaskMirror {
}
/** Interface that test runners implement. */
- public interface JUnitTestRunnerMirror {
+ interface JUnitTestRunnerMirror {
/**
* Used in formatter arguments as a placeholder for the basename
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 2d16c35..2eb2316 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
@@ -23,6 +23,7 @@ import java.io.BufferedWriter;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
@@ -99,25 +100,22 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
*/
private Permissions perm = null;
- private static final String JUNIT_4_TEST_ADAPTER
- = "junit.framework.JUnit4TestAdapter";
-
- private static final String[] DEFAULT_TRACE_FILTERS = new String[] {
- "junit.framework.TestCase",
- "junit.framework.TestResult",
- "junit.framework.TestSuite",
- "junit.framework.Assert.", // don't filter AssertionFailure
- "junit.swingui.TestRunner",
- "junit.awtui.TestRunner",
- "junit.textui.TestRunner",
- "java.lang.reflect.Method.invoke(",
- "sun.reflect.",
- "org.apache.tools.ant.",
- // JUnit 4 support:
- "org.junit.",
- "junit.framework.JUnit4TestAdapter",
- " more",
- };
+ private static final String JUNIT_4_TEST_ADAPTER = "junit.framework.JUnit4TestAdapter";
+
+ private static final String[] DEFAULT_TRACE_FILTERS = new String[] {"junit.framework.TestCase",
+ "junit.framework.TestResult",
+ "junit.framework.TestSuite",
+ "junit.framework.Assert.", // don't filter AssertionFailure
+ "junit.swingui.TestRunner",
+ "junit.awtui.TestRunner",
+ "junit.textui.TestRunner",
+ "java.lang.reflect.Method.invoke(",
+ "sun.reflect.",
+ "org.apache.tools.ant.",
+ // JUnit 4 support:
+ "org.junit.",
+ "junit.framework.JUnit4TestAdapter",
+ " more"};
/**
@@ -459,12 +457,10 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
useSingleMethodAdapter = true;
}
} else {
- junit4TestAdapterClass =
- Class.forName(JUNIT_4_TEST_ADAPTER,
+ junit4TestAdapterClass = Class.forName(JUNIT_4_TEST_ADAPTER,
true, loader);
if (testMethodsSpecified) {
- junit4TestAdapterClass =
- Class.forName(
+ junit4TestAdapterClass = Class.forName(
"org.apache.tools.ant.taskdefs.optional.junit.JUnit4TestMethodAdapter",
true, loader);
useSingleMethodAdapter = true;
@@ -491,13 +487,13 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
formalParams = new Class[] {Class.class, String[].class};
actualParams = new Object[] {testClass, methods};
} else {
- formalParams = new Class[] {Class.class, Class.forName("junit.framework.JUnit4TestAdapterCache")};
- actualParams = new Object[] {testClass, junit4TestAdapterCacheClass.getMethod("getInstance").invoke(null)};
+ formalParams = new Class[] {Class.class, Class.forName(
+ "junit.framework.JUnit4TestAdapterCache")};
+ actualParams = new Object[] {testClass, junit4TestAdapterCacheClass
+ .getMethod("getInstance").invoke(null)};
}
- suite =
- (Test) junit4TestAdapterClass
- .getConstructor(formalParams).
- newInstance(actualParams);
+ suite = (Test) junit4TestAdapterClass.getConstructor(formalParams)
+ .newInstance(actualParams);
} else {
// Use JUnit 3.
@@ -532,8 +528,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
if (exception != null) { // had an exception constructing suite
final int formatterSize = formatters.size();
for (int i = 0; i < formatterSize; i++) {
- ((TestListener) formatters.elementAt(i))
- .addError(null, exception);
+ ((TestListener) formatters.elementAt(i)).addError(null, exception);
}
junitTest.setCounts(1, 0, 1, 0);
junitTest.setRunTime(0);
@@ -542,10 +537,10 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
logTestListenerEvent("tests to run: " + suite.countTestCases());
suite.run(res);
} finally {
- if (junit4 ||
- suite.getClass().getName().equals(JUNIT_4_TEST_ADAPTER)) {
+ if (junit4 || suite.getClass().getName().equals(JUNIT_4_TEST_ADAPTER)) {
final int[] cnts = findJUnit4FailureErrorCount(res);
- junitTest.setCounts(res.runCount() + res.ignoredCount(), cnts[0], cnts[1], res.ignoredCount() + res.skippedCount());
+ junitTest.setCounts(res.runCount() + res.ignoredCount(), cnts[0], cnts[1],
+ res.ignoredCount() + res.skippedCount());
} else {
junitTest.setCounts(res.runCount() + res.ignoredCount(), res.failureCount(),
res.errorCount(), res.ignoredCount() + res.skippedCount());
@@ -610,12 +605,12 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
try {
suiteAnnotation = Class.forName("org.junit.Suite.SuiteClasses");
- } catch(final ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
// ignore - we don't have this annotation so make sure we don't check for it
}
try {
runWithAnnotation = Class.forName("org.junit.runner.RunWith");
- } catch(final ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
// also ignore as this annotation doesn't exist so tests can't use it
}
@@ -643,12 +638,13 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
return true;
}
if (runWithAnnotation != null && testClass.getAnnotation(runWithAnnotation) != null) {
- /* Class is marked with @RunWith. If this class is badly written (no test methods, multiple
- * constructors, private constructor etc) then the class is automatically run and fails in the
- * IDEs I've tried... so I'm happy handing the class to JUnit to try and run, and let JUnit
- * report a failure if a bad test case is provided. Trying to do anything else is likely to
- * result in us filtering out cases that could be valid for future versions of JUnit so would
- * just increase future maintenance work.
+ /* Class is marked with @RunWith. If this class is badly written (no test methods,
+ * multiple constructors, private constructor etc) then the class is automatically
+ * run and fails in the IDEs I've tried... so I'm happy handing the class to JUnit
+ * to try and run, and let JUnit report a failure if a bad test case is provided.
+ * Trying to do anything else is likely to result in us filtering out cases that
+ * could be valid for future versions of JUnit so would just increase future
+ * maintenance work.
*/
return true;
}
@@ -661,7 +657,8 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
return true;
}
} else {
- // check if JUnit3 class have public or protected no-args methods starting with names starting with test
+ // check if JUnit3 class have public or protected no-args methods starting with
+ // names starting with test
if (m.getName().startsWith("test") && m.getParameterTypes().length == 0
&& (Modifier.isProtected(m.getModifiers()) || Modifier.isPublic(m.getModifiers()))) {
return true;
@@ -713,6 +710,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
private void logTestListenerEvent(String msg) {
if (logTestListenerEvents) {
+ @SuppressWarnings("resource")
final PrintStream out = savedOut != null ? savedOut : System.out;
out.flush();
if (msg == null) {
@@ -720,8 +718,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
}
final StringTokenizer msgLines = new StringTokenizer(msg, "\r\n", false);
while (msgLines.hasMoreTokens()) {
- out.println(JUnitTask.TESTLISTENER_PREFIX
- + msgLines.nextToken());
+ out.println(JUnitTask.TESTLISTENER_PREFIX + msgLines.nextToken());
}
out.flush();
}
@@ -840,16 +837,14 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
private void fireStartTestSuite() {
final int size = formatters.size();
for (int i = 0; i < size; i++) {
- ((JUnitResultFormatter) formatters.elementAt(i))
- .startTestSuite(junitTest);
+ ((JUnitResultFormatter) formatters.elementAt(i)).startTestSuite(junitTest);
}
}
private void fireEndTestSuite() {
final int size = formatters.size();
for (int i = 0; i < size; i++) {
- ((JUnitResultFormatter) formatters.elementAt(i))
- .endTestSuite(junitTest);
+ ((JUnitResultFormatter) formatters.elementAt(i)).endTestSuite(junitTest);
}
}
@@ -915,7 +910,8 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
boolean logFailedTests = true;
boolean logTestListenerEvents = false;
boolean skipNonTests = false;
- int antThreadID = 0; /* Ant id of thread running this unit test, 0 in single-threaded mode */
+ /* Ant id of thread running this unit test, 0 in single-threaded mode */
+ int antThreadID = 0;
if (args.length == 0) {
System.err.println("required argument TestClassName missing");
@@ -954,7 +950,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
}
} else if (args[i].startsWith(Constants.PROPSFILE)) {
final FileInputStream in = new FileInputStream(args[i]
- .substring(Constants.PROPSFILE.length()));
+ .substring(Constants.PROPSFILE.length()));
props.load(in);
in.close();
} else if (args[i].startsWith(Constants.SHOWOUTPUT)) {
@@ -986,8 +982,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
int returnCode = SUCCESS;
if (multipleTests) {
try {
- final java.io.BufferedReader reader =
- new java.io.BufferedReader(new java.io.FileReader(args[0]));
+ final BufferedReader reader = new BufferedReader(new FileReader(args[0]));
String testCaseName;
String[] testMethodNames;
int code = 0;
@@ -1020,8 +1015,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
errorOccurred = (code == ERRORS);
failureOccurred = (code != SUCCESS);
if (errorOccurred || failureOccurred) {
- if ((errorOccurred && haltError)
- || (failureOccurred && haltFail)) {
+ if ((errorOccurred && haltError) || (failureOccurred && haltFail)) {
registerNonCrash();
System.exit(code);
} else {
@@ -1029,8 +1023,7 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
returnCode = code;
}
if (logFailedTests) {
- System.out.println("TEST " + t.getName()
- + " FAILED");
+ System.out.println("TEST " + t.getName() + " FAILED");
}
}
}
@@ -1043,9 +1036,8 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
t.setThread(antThreadID);
t.setProperties(props);
t.setSkipNonTests(skipNonTests);
- returnCode = launch(
- t, methods, haltError, stackfilter, haltFail,
- showOut, outputToFormat, logTestListenerEvents);
+ returnCode = launch(t, methods, haltError, stackfilter, haltFail, showOut,
+ outputToFormat, logTestListenerEvents);
}
registerNonCrash();
@@ -1090,9 +1082,8 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
for (int i = 0; i < size; i++) {
final FormatterElement fe = (FormatterElement) fromCmdLine.elementAt(i);
if (multipleTests && fe.getUseFile()) {
- final File destFile =
- new File(test.getTodir(),
- test.getOutfile() + fe.getExtension());
+ final File destFile = new File(test.getTodir(),
+ test.getOutfile() + fe.getExtension());
fe.setOutfile(destFile);
}
runner.addFormatter((JUnitResultFormatter) fe.createFormatter());
@@ -1119,9 +1110,8 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
} else {
final int fName = line.indexOf(IGNORED_FILE_NAME);
if (fName > -1) {
- fe.setExtension(line
- .substring(fName
- + IGNORED_FILE_NAME.length()));
+ fe.setExtension(line.substring(fName
+ + IGNORED_FILE_NAME.length()));
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 e381a70..7bf8816 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
@@ -45,8 +45,7 @@ public class TearDownOnVmCrash implements JUnitResultFormatter {
*/
public void startTestSuite(final JUnitTest suite) {
suiteName = suite.getName();
- if (suiteName != null &&
- suiteName.endsWith(JUnitTask.NAME_OF_DUMMY_TEST)) {
+ if (suiteName != null && suiteName.endsWith(JUnitTask.NAME_OF_DUMMY_TEST)) {
// no way to know which class caused the timeout
suiteName = null;
}
@@ -58,28 +57,35 @@ public class TearDownOnVmCrash implements JUnitResultFormatter {
* error generated by Ant.
*/
public void addError(final Test fakeTest, final Throwable t) {
- if (suiteName != null
- && fakeTest instanceof JUnitTaskMirrorImpl.VmExitErrorTest) {
+ if (suiteName != null && fakeTest instanceof JUnitTaskMirrorImpl.VmExitErrorTest) {
tearDown();
}
}
// no need to implement the rest
- public void addFailure(Test test, Throwable t) {}
+ 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 {
@@ -96,8 +102,7 @@ public class TearDownOnVmCrash implements JUnitResultFormatter {
}
if (testClass == null && getClass().getClassLoader() != null) {
try {
- testClass =
- getClass().getClassLoader().loadClass(suiteName);
+ testClass = getClass().getClassLoader().loadClass(suiteName);
} catch (ClassNotFoundException cnfe) {
// ignore
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 80cb681..13b418d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -447,33 +447,27 @@ public class FTP extends Task implements FTPTaskConfig {
}
if (isOK) {
currentelement = path.replace(remoteFileSep.charAt(0), File.separatorChar);
- if (!isFollowSymlinks()
- && traversesSymlinks) {
+ if (!isFollowSymlinks() && traversesSymlinks) {
continue;
}
if (myfile.isDirectory()) {
- if (isIncluded(currentelement)
- && currentelement.length() > 0) {
+ if (isIncluded(currentelement) && currentelement.length() > 0) {
accountForIncludedDir(currentelement, myfile, true);
} else {
if (currentelement.length() > 0) {
- if (currentelement.charAt(currentelement
- .length() - 1)
+ if (currentelement.charAt(currentelement.length() - 1)
!= File.separatorChar) {
- currentelement =
- currentelement + File.separatorChar;
+ currentelement = currentelement + File.separatorChar;
}
}
scandir(myfile.getAbsolutePath(), currentelement, true);
}
} else {
- if (isCaseSensitive
- && originalpattern.equals(currentelement)) {
+ if (isCaseSensitive && originalpattern.equals(currentelement)) {
accountForIncludedFile(currentelement);
} else if (!isCaseSensitive
- && originalpattern
- .equalsIgnoreCase(currentelement)) {
+ && originalpattern.equalsIgnoreCase(currentelement)) {
accountForIncludedFile(currentelement);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
index 5efcb3f..74ef819 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
@@ -337,7 +337,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
try {
path = myfile.getRelativePath();
traversesSymlinks = myfile.isTraverseSymlinks();
- } catch (IOException be) {
+ } catch (IOException be) {
throw new BuildException(be, task.getLocation());
} catch (BuildException be) {
isOK = false;
@@ -1177,8 +1177,8 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
for (int i = 0; i < dsfiles.length; i++) {
final String dsfile = dsfiles[i];
executeRetryable(h, new Retryable() {
- public void execute() throws IOException {
- switch (task.getAction()) {
+ public void execute() throws IOException {
+ switch (task.getAction()) {
case FTPTask.SEND_FILES:
sendFile(ftp, fdir, dsfile);
break;
@@ -1199,9 +1199,9 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
default:
throw new BuildException("unknown ftp action "
+ task.getAction());
- }
}
- }, dsfile);
+ }
+ }, dsfile);
}
}
} finally {
@@ -1443,20 +1443,20 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
+ task.getGranularityMillis();
StringBuffer msg;
- synchronized(TIMESTAMP_LOGGING_SDF) {
+ synchronized (TIMESTAMP_LOGGING_SDF) {
msg = new StringBuffer(" [")
.append(TIMESTAMP_LOGGING_SDF.format(new Date(localTimestamp)))
.append("] local");
}
task.log(msg.toString(), Project.MSG_VERBOSE);
- synchronized(TIMESTAMP_LOGGING_SDF) {
+ synchronized (TIMESTAMP_LOGGING_SDF) {
msg = new StringBuffer(" [")
.append(TIMESTAMP_LOGGING_SDF.format(new Date(adjustedRemoteTimestamp)))
.append("] remote");
}
if (remoteTimestamp != adjustedRemoteTimestamp) {
- synchronized(TIMESTAMP_LOGGING_SDF) {
+ synchronized (TIMESTAMP_LOGGING_SDF) {
msg.append(" - (raw: ")
.append(TIMESTAMP_LOGGING_SDF.format(new Date(remoteTimestamp)))
.append(")");
@@ -1936,4 +1936,3 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
}
}
}
-
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
index 98f51ca..6956019 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
@@ -202,10 +202,8 @@ public class Pvcs extends org.apache.tools.ant.Task {
tmp2 = new File("pvcs_ant_" + rand.nextLong() + ".log");
log(commandLine.describeCommand(), Project.MSG_VERBOSE);
try {
- result = runCmd(commandLine,
- new PumpStreamHandler(fos,
- new LogOutputStream(this,
- Project.MSG_WARN)));
+ result = runCmd(commandLine, new PumpStreamHandler(fos,
+ new LogOutputStream(this, Project.MSG_WARN)));
} finally {
FileUtils.close(fos);
}
@@ -250,8 +248,7 @@ public class Pvcs extends org.apache.tools.ant.Task {
commandLine.createArgument().setValue("-v" + getLabel());
} else {
if (getRevision() != null) {
- commandLine.createArgument().setValue("-r"
- + getRevision());
+ commandLine.createArgument().setValue("-r" + getRevision());
}
}
}
@@ -304,10 +301,10 @@ public class Pvcs extends org.apache.tools.ant.Task {
String line = in.readLine();
while (line != null) {
log("Considering \"" + line + "\"", Project.MSG_VERBOSE);
- if (line.startsWith("\"\\") // Checking for "\
- || line.startsWith("\"/") // or "/
- // or "X:\...
- || (line.length() > POS_3 && line.startsWith("\"")
+ if (line.startsWith("\"\\") // Checking for "\
+ || line.startsWith("\"/") // or "/
+ // or "X:\...
+ || (line.length() > POS_3 && line.startsWith("\"")
&& Character.isLetter(line.charAt(POS_1))
&& String.valueOf(line.charAt(POS_2)).equals(":")
&& String.valueOf(line.charAt(POS_3)).equals("\\"))) {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 b5088a7..db857fc 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
@@ -48,7 +48,7 @@ public class Directory {
* @param directory a directory
* @param parent a parent Directory
*/
- public Directory(File directory , Directory parent) {
+ public Directory(File directory, Directory parent) {
this.parent = parent;
this.childDirectories = new LinkedHashSet();
this.files = new ArrayList();
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 26d7e14..4e04a46 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
@@ -428,8 +428,7 @@ public class Scp extends SSHBase {
// password. (so if the path contains an @ and a : it will not work)
int indexOfCurrentAt = indexOfAt;
final int indexOfLastColon = uri.lastIndexOf(':');
- while (indexOfCurrentAt > -1 && indexOfCurrentAt < indexOfLastColon)
- {
+ while (indexOfCurrentAt > -1 && indexOfCurrentAt < indexOfLastColon) {
indexOfAt = indexOfCurrentAt;
indexOfCurrentAt = uri.indexOf('@', indexOfCurrentAt + 1);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 b6b9b01..bce3f78 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
@@ -42,7 +42,7 @@ public class ScpFromMessage extends AbstractSshMessage {
private static final int HUNDRED_KILOBYTES = 102400;
private static final byte LINE_FEED = 0x0a;
- private static final int BUFFER_SIZE = 100*1024;
+ private static final int BUFFER_SIZE = 100 * 1024;
private String remoteFile;
private File localFile;
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
index b095c40..650804f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
@@ -36,7 +36,7 @@ import com.jcraft.jsch.Session;
public class ScpToMessage extends AbstractSshMessage {
private static final int HUNDRED_KILOBYTES = 102400;
- private static final int BUFFER_SIZE = 100*1024;
+ private static final int BUFFER_SIZE = 100 * 1024;
private static final int DEFAULT_DIR_MODE = 0755;
private static final int DEFAULT_FILE_MODE = 0644;
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java
index 16f1015..26c3c8d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java
@@ -76,7 +76,7 @@ public class MSVSSCREATE extends MSVSS {
*
* @param quiet The boolean value for quiet.
*/
- public final void setQuiet (boolean quiet) {
+ public final void setQuiet(boolean quiet) {
super.setInternalQuiet(quiet);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
index 59ee272..afecf95 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
@@ -93,7 +93,7 @@ public class MSVSSGET extends MSVSS {
*
* @param quiet The boolean value for quiet.
*/
- public final void setQuiet (boolean quiet) {
+ public final void setQuiet(boolean quiet) {
super.setInternalQuiet(quiet);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
index e029191..5c0b96a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
@@ -176,8 +176,8 @@ public class Attrib extends ExecuteOn {
* @return true if the os is valid.
*/
protected boolean isValidOs() {
- return getOs() == null && getOsFamily() == null ?
- Os.isFamily(Os.FAMILY_WINDOWS) : super.isValidOs();
+ return getOs() == null && getOsFamily() == null
+ ? Os.isFamily(Os.FAMILY_WINDOWS) : super.isValidOs();
}
private static String getSignString(boolean attr) {
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
index 559c769..81e043e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
@@ -45,8 +45,7 @@ public class XNewRmic extends ForkingSunRmic {
String[] options = new String[] {
"-Xnew"
};
- Commandline commandline = super.setupRmicCommand(options);
- return commandline;
+ return super.setupRmicCommand(options);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/types/Commandline.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java
index 8b201cf..c8f4eaf 100644
--- a/src/main/org/apache/tools/ant/types/Commandline.java
+++ b/src/main/org/apache/tools/ant/types/Commandline.java
@@ -188,7 +188,7 @@ public class Commandline implements Cloneable {
*/
public String[] getParts() {
if (parts == null || parts.length == 0
- || (prefix.length() == 0 && suffix.length() == 0)) {
+ || (prefix.length() == 0 && suffix.length() == 0)) {
return parts;
}
String[] fullParts = new String[parts.length];