ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gin...@apache.org
Subject [6/6] ant git commit: Checkstyle: whitespace, line continuation and modifier idiosyncrasies
Date Mon, 11 Dec 2017 22:42:54 GMT
Checkstyle: whitespace, line continuation and modifier idiosyncrasies

Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/5eef12a9
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/5eef12a9
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/5eef12a9

Branch: refs/heads/1.9.x
Commit: 5eef12a964e1813763c4a0ab6a056edcfa768814
Parents: 685324a
Author: Gintas Grigelionis <gintas@apache.org>
Authored: Mon Dec 11 23:30:20 2017 +0100
Committer: Gintas Grigelionis <gintas@apache.org>
Committed: Mon Dec 11 23:30:20 2017 +0100

----------------------------------------------------------------------
 .../org/apache/tools/ant/ComponentHelper.java   |   8 +-
 .../org/apache/tools/ant/DemuxOutputStream.java |   2 +-
 .../org/apache/tools/ant/DirectoryScanner.java  |  56 ++--
 .../apache/tools/ant/IntrospectionHelper.java   |   2 +-
 src/main/org/apache/tools/ant/Project.java      |   8 +-
 .../apache/tools/ant/RuntimeConfigurable.java   |   3 +-
 .../org/apache/tools/ant/UnknownElement.java    |   3 +-
 src/main/org/apache/tools/ant/XmlLogger.java    |   2 +-
 .../tools/ant/filters/BaseFilterReader.java     |   2 +-
 .../apache/tools/ant/filters/ReplaceTokens.java |   9 +-
 .../org/apache/tools/ant/launch/Launcher.java   |  20 +-
 .../org/apache/tools/ant/launch/Locator.java    |   3 +-
 .../ant/listener/CommonsLoggingListener.java    |   8 +-
 src/main/org/apache/tools/ant/taskdefs/Ant.java |   2 +-
 .../apache/tools/ant/taskdefs/BindTargets.java  |   5 +-
 .../org/apache/tools/ant/taskdefs/CVSPass.java  |   2 +-
 .../org/apache/tools/ant/taskdefs/Checksum.java |   2 +-
 .../apache/tools/ant/taskdefs/Classloader.java  |   2 +-
 .../org/apache/tools/ant/taskdefs/Definer.java  |   3 +-
 .../org/apache/tools/ant/taskdefs/Delete.java   |  29 +-
 .../org/apache/tools/ant/taskdefs/EchoXML.java  |   3 +-
 .../apache/tools/ant/taskdefs/ExecuteJava.java  |   4 +-
 .../apache/tools/ant/taskdefs/ExecuteOn.java    |  36 +--
 .../org/apache/tools/ant/taskdefs/FixCRLF.java  |   4 +-
 src/main/org/apache/tools/ant/taskdefs/Get.java |  72 ++---
 .../org/apache/tools/ant/taskdefs/HostInfo.java |   2 +-
 .../org/apache/tools/ant/taskdefs/Input.java    |  19 +-
 src/main/org/apache/tools/ant/taskdefs/Jar.java |   6 +-
 .../org/apache/tools/ant/taskdefs/Javac.java    |   5 +-
 .../org/apache/tools/ant/taskdefs/Javadoc.java  |  10 +-
 .../org/apache/tools/ant/taskdefs/KeySubst.java |  12 +-
 .../apache/tools/ant/taskdefs/PathConvert.java  |   2 +-
 .../org/apache/tools/ant/taskdefs/Replace.java  |   2 +-
 .../org/apache/tools/ant/taskdefs/SQLExec.java  |  14 +-
 .../apache/tools/ant/taskdefs/StreamPumper.java |   2 +-
 src/main/org/apache/tools/ant/taskdefs/Tar.java |   2 +-
 .../org/apache/tools/ant/taskdefs/Tstamp.java   |  25 +-
 .../apache/tools/ant/taskdefs/XSLTProcess.java  |   6 +-
 .../apache/tools/ant/taskdefs/XmlProperty.java  |  24 +-
 src/main/org/apache/tools/ant/taskdefs/Zip.java |  12 +-
 .../compilers/DefaultCompilerAdapter.java       |  22 +-
 .../tools/ant/taskdefs/compilers/Gcj.java       |  11 +-
 .../tools/ant/taskdefs/compilers/Javac12.java   |   2 +-
 .../tools/ant/taskdefs/compilers/Javac13.java   |   2 +-
 .../tools/ant/taskdefs/condition/Http.java      |   3 +-
 .../ant/taskdefs/condition/IsLastModified.java  |   2 +-
 .../tools/ant/taskdefs/email/Message.java       |   4 +-
 .../launcher/Java13CommandLauncher.java         |   4 +-
 .../taskdefs/launcher/VmsCommandLauncher.java   |   4 +-
 .../apache/tools/ant/taskdefs/optional/Cab.java |   3 +-
 .../ant/taskdefs/optional/EchoProperties.java   |   2 +-
 .../tools/ant/taskdefs/optional/Javah.java      |   8 +-
 .../ant/taskdefs/optional/Native2Ascii.java     |  11 +-
 .../tools/ant/taskdefs/optional/NetRexxC.java   |   7 +-
 .../ant/taskdefs/optional/PropertyFile.java     |  38 ++-
 .../apache/tools/ant/taskdefs/optional/Rpm.java |   7 +-
 .../optional/ejb/BorlandDeploymentTool.java     |   3 +-
 .../optional/ejb/DescriptorHandler.java         |   5 +-
 .../optional/ejb/GenericDeploymentTool.java     |   2 +-
 .../taskdefs/optional/ejb/IPlanetEjbcTask.java  |   2 +-
 .../optional/ejb/JonasDeploymentTool.java       |   2 +-
 .../optional/ejb/OrionDeploymentTool.java       |   2 +-
 .../optional/extension/ExtensionAdapter.java    |   2 +-
 .../ant/taskdefs/optional/image/Image.java      |  15 +-
 .../optional/j2ee/JonasHotDeploymentTool.java   |   4 +-
 .../taskdefs/optional/jdepend/JDependTask.java  |   2 +-
 .../tools/ant/taskdefs/optional/jsp/JspC.java   |   2 +-
 .../taskdefs/optional/jsp/JspNameMangler.java   |   2 +-
 .../tools/ant/taskdefs/optional/jsp/WLJspc.java |   4 +-
 .../optional/junit/AggregateTransformer.java    |   2 +-
 .../ant/taskdefs/optional/junit/BaseTest.java   |   3 +-
 .../ant/taskdefs/optional/junit/Constants.java  |   4 +-
 .../ant/taskdefs/optional/junit/DOMUtil.java    |   2 +-
 .../optional/junit/FailureRecorder.java         |   4 +-
 .../optional/junit/IgnoredTestResult.java       |   2 +-
 .../ant/taskdefs/optional/junit/JUnitTask.java  |  33 +-
 .../optional/junit/JUnitTaskMirror.java         |   6 +-
 .../optional/junit/JUnitTestRunner.java         | 122 ++++---
 .../optional/junit/TearDownOnVmCrash.java       |  33 +-
 .../tools/ant/taskdefs/optional/net/FTP.java    |  18 +-
 .../optional/net/FTPTaskMirrorImpl.java         |  17 +-
 .../tools/ant/taskdefs/optional/pvcs/Pvcs.java  |  17 +-
 .../ant/taskdefs/optional/ssh/Directory.java    |   2 +-
 .../tools/ant/taskdefs/optional/ssh/Scp.java    |   3 +-
 .../taskdefs/optional/ssh/ScpFromMessage.java   |   2 +-
 .../ant/taskdefs/optional/ssh/ScpToMessage.java |   2 +-
 .../ant/taskdefs/optional/vss/MSVSSCREATE.java  |   2 +-
 .../ant/taskdefs/optional/vss/MSVSSGET.java     |   2 +-
 .../ant/taskdefs/optional/windows/Attrib.java   |   4 +-
 .../tools/ant/taskdefs/rmic/XNewRmic.java       |   3 +-
 .../org/apache/tools/ant/types/Commandline.java |   2 +-
 .../apache/tools/ant/types/CommandlineJava.java |  46 +--
 .../org/apache/tools/ant/types/DataType.java    |   2 +-
 .../org/apache/tools/ant/types/XMLCatalog.java  |   1 -
 .../tools/ant/types/optional/image/Text.java    |   4 +-
 .../ant/types/resources/MultiRootFileSet.java   |   2 +-
 .../modifiedselector/ModifiedSelector.java      |   6 +-
 .../apache/tools/ant/util/DOMElementWriter.java |   3 +-
 .../org/apache/tools/ant/util/JavaEnvUtils.java |   3 +-
 .../ant/util/LayoutPreservingProperties.java    |  10 +-
 .../apache/tools/ant/util/MergingMapper.java    |   3 +-
 .../org/apache/tools/ant/util/ProcessUtil.java  |   2 +-
 .../tools/ant/util/ReaderInputStream.java       |   2 +-
 .../org/apache/tools/ant/util/ReflectUtil.java  |   2 +-
 .../apache/tools/ant/util/ResourceUtils.java    |   2 +-
 .../tools/ant/util/optional/ScriptRunner.java   |   3 +-
 src/main/org/apache/tools/bzip2/BlockSort.java  |  35 +-
 .../apache/tools/bzip2/CBZip2OutputStream.java  |  66 ++--
 src/main/org/apache/tools/mail/MailMessage.java |   2 +-
 src/main/org/apache/tools/tar/TarBuffer.java    |   4 +-
 src/main/org/apache/tools/tar/TarEntry.java     |  65 ++--
 .../org/apache/tools/tar/TarInputStream.java    |  40 +--
 .../org/apache/tools/tar/TarOutputStream.java   |   8 +-
 src/main/org/apache/tools/tar/TarUtils.java     |  56 ++--
 .../org/apache/tools/zip/ExtraFieldUtils.java   |  82 +++--
 .../apache/tools/zip/FallbackZipEncoding.java   |   2 +-
 .../org/apache/tools/zip/GeneralPurposeBit.java |  13 +-
 .../org/apache/tools/zip/NioZipEncoding.java    |   6 +-
 .../apache/tools/zip/Simple8BitZipEncoding.java |  16 +-
 .../tools/zip/UnicodeCommentExtraField.java     |   2 +-
 src/main/org/apache/tools/zip/UnixStat.java     |  10 +-
 .../zip/UnsupportedZipFeatureException.java     |   3 +-
 .../zip/Zip64ExtendedInformationExtraField.java |   3 +-
 .../apache/tools/zip/ZipEightByteInteger.java   |   4 +-
 src/main/org/apache/tools/zip/ZipEncoding.java  |   2 +-
 .../org/apache/tools/zip/ZipEncodingHelper.java |  17 +-
 src/main/org/apache/tools/zip/ZipEntry.java     |  75 ++---
 src/main/org/apache/tools/zip/ZipLong.java      |   4 +-
 .../org/apache/tools/zip/ZipOutputStream.java   |  17 +-
 src/main/org/apache/tools/zip/ZipShort.java     |   8 +-
 src/main/org/apache/tools/zip/ZipUtil.java      |   2 +-
 .../apache/tools/ant/AntClassLoaderTest.java    |  12 +-
 .../org/apache/tools/ant/BuildFileRule.java     |   2 +-
 .../org/apache/tools/ant/BuildFileTest.java     |  12 +-
 .../apache/tools/ant/DirectoryScannerTest.java  | 178 ++++------
 .../org/apache/tools/ant/FileUtilities.java     |   2 +-
 .../org/apache/tools/ant/ImmutableTest.java     |   2 +-
 .../tools/ant/IntrospectionHelperTest.java      |   6 +-
 .../apache/tools/ant/PropertyExpansionTest.java |  44 +--
 .../tools/ant/filters/TokenFilterTest.java      |   6 +-
 .../apache/tools/ant/launch/LocatorTest.java    |   4 +-
 .../org/apache/tools/ant/taskdefs/AntTest.java  |  17 +-
 .../apache/tools/ant/taskdefs/BZip2Test.java    |   1 -
 .../apache/tools/ant/taskdefs/ExecTaskTest.java |   2 +-
 .../tools/ant/taskdefs/ExecuteJavaTest.java     |  11 +-
 .../tools/ant/taskdefs/ExecuteWatchdogTest.java |  11 +-
 .../org/apache/tools/ant/taskdefs/JarTest.java  |   3 +-
 .../org/apache/tools/ant/taskdefs/JavaTest.java |   3 +-
 .../ant/taskdefs/ManifestClassPathTest.java     |  82 ++---
 .../apache/tools/ant/taskdefs/ManifestTest.java |  32 +-
 .../apache/tools/ant/taskdefs/ParallelTest.java |  10 +-
 .../apache/tools/ant/taskdefs/ReplaceTest.java  |   7 +-
 .../tools/ant/taskdefs/RmicAdvancedTest.java    |   2 +-
 .../org/apache/tools/ant/taskdefs/RmicTest.java |   2 +-
 .../apache/tools/ant/taskdefs/SQLExecTest.java  |  23 +-
 .../apache/tools/ant/taskdefs/SleepTest.java    |   4 +-
 .../apache/tools/ant/taskdefs/StyleTest.java    |  48 ++-
 .../apache/tools/ant/taskdefs/SubAntTest.java   |  18 +-
 .../apache/tools/ant/taskdefs/TouchTest.java    |   2 +-
 .../tools/ant/taskdefs/TypeAdapterTest.java     |  10 +-
 .../apache/tools/ant/taskdefs/UnzipTest.java    |  57 ++--
 .../tools/ant/taskdefs/XmlPropertyTest.java     |   2 +-
 .../org/apache/tools/ant/taskdefs/ZipTest.java  |   3 +-
 .../compilers/DefaultCompilerAdapterTest.java   |  22 +-
 .../taskdefs/cvslib/ChangeLogWriterTest.java    |   2 +-
 .../org/apache/tools/ant/taskdefs/dir2/A.java   |   2 +-
 .../tools/ant/taskdefs/optional/ANTLRTest.java  |  12 +-
 .../optional/AbstractXSLTLiaisonTest.java       |  32 +-
 .../taskdefs/optional/EchoPropertiesTest.java   |   4 +-
 .../tools/ant/taskdefs/optional/JavahTest.java  |   3 +-
 .../tools/ant/taskdefs/optional/JspcTest.java   |   4 +-
 .../ant/taskdefs/optional/Native2AsciiTest.java |   2 +-
 .../ant/taskdefs/optional/PropertyFileTest.java |  10 +-
 .../tools/ant/taskdefs/optional/PvcsTest.java   |   2 +-
 .../taskdefs/optional/SchemaValidateTest.java   |   3 +-
 .../ant/taskdefs/optional/TraXLiaisonTest.java  |   4 +-
 .../optional/XmlValidateCatalogTest.java        |   2 +-
 .../ant/taskdefs/optional/XmlValidateTest.java  |  21 +-
 .../tools/ant/taskdefs/optional/XsltTest.java   |   2 +-
 .../taskdefs/optional/i18n/TranslateTest.java   |   4 +-
 .../ant/taskdefs/optional/image/ImageTest.java  |  31 +-
 .../optional/junit/JUnitReportTest.java         |   1 -
 .../taskdefs/optional/junit/JUnitTaskTest.java  |   4 +-
 .../optional/junit/JUnitTestListenerTest.java   |  12 +-
 .../optional/junit/JUnitTestRunnerTest.java     |  14 +-
 .../junit/XMLFormatterWithCDATAOnSystemOut.java |  30 +-
 .../ant/taskdefs/optional/net/FTPTest.java      |  12 +-
 .../taskdefs/optional/script/ScriptDefTest.java |   6 +-
 .../ant/taskdefs/optional/sos/SOSTest.java      |   2 +-
 .../ant/taskdefs/optional/ssh/ScpTest.java      |   4 +-
 .../ant/taskdefs/optional/vss/MSVSSTest.java    |   6 +-
 .../apache/tools/ant/types/CommandlineTest.java |   6 +-
 .../ant/types/EnumeratedAttributeTest.java      |   4 +-
 .../apache/tools/ant/types/FilterSetTest.java   |   8 +-
 .../apache/tools/ant/types/PatternSetTest.java  |   4 +-
 .../apache/tools/ant/types/TarFileSetTest.java  |   2 +-
 .../apache/tools/ant/types/XMLCatalogTest.java  |   6 +-
 .../apache/tools/ant/types/ZipFileSetTest.java  |   2 +-
 .../tools/ant/types/mappers/MapperResult.java   |   9 +-
 .../types/optional/depend/ClassFileSetTest.java |  10 +-
 .../resources/LazyResourceCollectionTest.java   |  15 +-
 .../ant/types/selectors/BaseSelectorRule.java   |  16 +-
 .../ant/types/selectors/BaseSelectorTest.java   |  20 +-
 .../ant/types/selectors/DateSelectorTest.java   |   2 +-
 .../types/selectors/ModifiedSelectorTest.java   |  20 +-
 .../org/apache/tools/ant/types/selectors/README |   6 +-
 .../ant/types/selectors/SizeSelectorTest.java   |   2 +-
 .../ant/types/selectors/TypeSelectorTest.java   |   2 +-
 .../tools/ant/util/Base64ConverterTest.java     |   4 +-
 .../apache/tools/ant/util/DateUtilsTest.java    |   6 +-
 .../apache/tools/ant/util/JavaEnvUtilsTest.java |  53 +--
 .../ant/util/regexp/RegexpMatcherTest.java      |   3 +-
 .../org/apache/tools/bzip2/BlockSortTest.java   |   8 +-
 .../org/apache/tools/mail/MailMessageTest.java  | 324 +++++++++----------
 .../org/apache/tools/zip/AsiExtraFieldTest.java |  48 +--
 .../org/apache/tools/zip/UTF8ZipFilesTest.java  |   6 +-
 .../org/apache/tools/zip/ZipEncodingTest.java   |   7 +-
 .../org/apache/tools/zip/ZipEntryTest.java      |  24 +-
 .../junit/org/apache/tools/zip/ZipLongTest.java |   2 +-
 .../org/apache/tools/zip/ZipShortTest.java      |   2 +-
 220 files changed, 1385 insertions(+), 1635 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/ComponentHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java
index 9d0af85..31ab880 100644
--- a/src/main/org/apache/tools/ant/ComponentHelper.java
+++ b/src/main/org/apache/tools/ant/ComponentHelper.java
@@ -59,7 +59,7 @@ import org.apache.tools.ant.util.FileUtils;
  */
 public class ComponentHelper  {
     /** Map of component name to lists of restricted definitions */
-    private Map<String, List<AntTypeDefinition>>          restrictedDefinitions = new HashMap<String, List<AntTypeDefinition>>();
+    private Map<String, List<AntTypeDefinition>> restrictedDefinitions = new HashMap<String, List<AntTypeDefinition>>();
 
     /** Map from component name to anttypedefinition */
     private final Hashtable<String, AntTypeDefinition> antTypeTable = new Hashtable<String, AntTypeDefinition>();
@@ -146,8 +146,8 @@ public class ComponentHelper  {
         if (project == null) {
             return null;
         }
-        // Singleton for now, it may change ( per/classloader )
-        ComponentHelper ph = (ComponentHelper) project.getReference(COMPONENT_HELPER_REFERENCE);
+        // Singleton for now, it may change (per/classloader)
+        ComponentHelper ph = project.getReference(COMPONENT_HELPER_REFERENCE);
         if (ph != null) {
             return ph;
         }
@@ -972,7 +972,7 @@ public class ComponentHelper  {
                     out.println("Cause: The constructor threw the exception");
                     out.println(t.toString());
                     t.printStackTrace(out); //NOSONAR
-                }  catch (NoClassDefFoundError ncdfe) {
+                } catch (NoClassDefFoundError ncdfe) {
                     jars = true;
                     out.println("Cause:  A class needed by class " + classname
                             + " cannot be found: ");

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/DemuxOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/DemuxOutputStream.java b/src/main/org/apache/tools/ant/DemuxOutputStream.java
index e69c3a4..9645ca7 100644
--- a/src/main/org/apache/tools/ant/DemuxOutputStream.java
+++ b/src/main/org/apache/tools/ant/DemuxOutputStream.java
@@ -124,7 +124,7 @@ public class DemuxOutputStream extends OutputStream {
      */
     private void removeBuffer() {
         Thread current = Thread.currentThread();
-        buffers.remove (current);
+        buffers.remove(current);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/DirectoryScanner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index f4b8fdc..b739ff8 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -792,8 +792,7 @@ public class DirectoryScanner
                 System.arraycopy(this.excludes, 0, tmp, 0,
                                  this.excludes.length);
                 for (int i = 0; i < excludes.length; i++) {
-                    tmp[this.excludes.length + i] =
-                        normalizePattern(excludes[i]);
+                    tmp[this.excludes.length + i] = normalizePattern(excludes[i]);
                 }
                 this.excludes = tmp;
             } else {
@@ -856,8 +855,7 @@ public class DirectoryScanner
                 while (scanning) {
                     try {
                         scanLock.wait();
-                    } catch (final InterruptedException e) {
-                        continue;
+                    } catch (final InterruptedException ignored) {
                     }
                 }
                 if (illegal != null) {
@@ -875,8 +873,7 @@ public class DirectoryScanner
 
                 // set in/excludes to reasonable defaults if needed:
                 final boolean nullIncludes = (includes == null);
-                includes = nullIncludes
-                    ? new String[] {SelectorUtils.DEEP_TREE_MATCH} : includes;
+                includes = nullIncludes ? new String[] {SelectorUtils.DEEP_TREE_MATCH} : includes;
                 final boolean nullExcludes = (excludes == null);
                 excludes = nullExcludes ? new String[0] : excludes;
 
@@ -954,8 +951,7 @@ public class DirectoryScanner
         for (int i = 0; i < includePatterns.length; i++) {
             final String pattern = includePatterns[i].toString();
             if (!shouldSkipPattern(pattern)) {
-                newroots.put(includePatterns[i].rtrimWildcardTokens(),
-                             pattern);
+                newroots.put(includePatterns[i].rtrimWildcardTokens(), pattern);
             }
         }
         for (final Map.Entry<String, TokenizedPath> entry : includeNonPatterns.entrySet()) {
@@ -983,8 +979,7 @@ public class DirectoryScanner
             for (final Map.Entry<TokenizedPath, String> entry : newroots.entrySet()) {
                 TokenizedPath currentPath = entry.getKey();
                 String currentelement = currentPath.toString();
-                if (basedir == null
-                    && !FileUtils.isAbsolutePath(currentelement)) {
+                if (basedir == null && !FileUtils.isAbsolutePath(currentelement)) {
                     continue;
                 }
                 File myfile = new File(basedir, currentelement);
@@ -1003,10 +998,8 @@ public class DirectoryScanner
                             if (myfile != null && basedir != null) {
                                 currentelement = FILE_UTILS.removeLeadingPath(
                                     basedir, myfile);
-                                if (!currentPath.toString()
-                                    .equals(currentelement)) {
-                                    currentPath =
-                                        new TokenizedPath(currentelement);
+                                if (!currentPath.toString().equals(currentelement)) {
+                                    currentPath = new TokenizedPath(currentelement);
                                 }
                             }
                         }
@@ -1123,8 +1116,7 @@ public class DirectoryScanner
 
                 // set in/excludes to reasonable defaults if needed:
                 final boolean nullIncludes = (includes == null);
-                includes = nullIncludes
-                    ? new String[] {SelectorUtils.DEEP_TREE_MATCH} : includes;
+                includes = nullIncludes ? new String[] {SelectorUtils.DEEP_TREE_MATCH} : includes;
                 final boolean nullExcludes = (excludes == null);
                 excludes = nullExcludes ? new String[0] : excludes;
 
@@ -1294,10 +1286,8 @@ public class DirectoryScanner
                 } else {
                     everythingIncluded = false;
                     dirsNotIncluded.addElement(name);
-                    if (fast && couldHoldIncluded(newPath)
-                        && !contentsExcluded(newPath)) {
-                        scandir(file, newPath, fast, children,
-                                directoryNamesFollowed);
+                    if (fast && couldHoldIncluded(newPath) && !contentsExcluded(newPath)) {
+                        scandir(file, newPath, fast, children, directoryNamesFollowed);
                     }
                 }
                 if (!fast) {
@@ -1351,10 +1341,8 @@ public class DirectoryScanner
     }
 
     private void accountForNotFollowedSymlink(final TokenizedPath name, final File file) {
-        if (!isExcluded(name) &&
-            (isIncluded(name)
-             || (file.isDirectory() && couldHoldIncluded(name)
-                 && !contentsExcluded(name)))) {
+        if (!isExcluded(name) && (isIncluded(name)
+                || (file.isDirectory() && couldHoldIncluded(name) && !contentsExcluded(name)))) {
             notFollowedSymlinks.add(file.getAbsolutePath());
         }
     }
@@ -1383,7 +1371,7 @@ public class DirectoryScanner
      * Test whether or not a name matches against at least one include
      * pattern.
      *
-     * @param name The name to match. Must not be <code>null</code>.
+     * @param name The path to match. Must not be <code>null</code>.
      * @return <code>true</code> when the name matches against at least one
      *         include pattern, or <code>false</code> otherwise.
      */
@@ -1496,8 +1484,7 @@ public class DirectoryScanner
      *  @since Ant 1.6
      */
     private boolean isMorePowerfulThanExcludes(final String name) {
-        final String soughtexclude =
-            name + File.separatorChar + SelectorUtils.DEEP_TREE_MATCH;
+        final String soughtexclude = name + File.separatorChar + SelectorUtils.DEEP_TREE_MATCH;
         for (int counter = 0; counter < excludePatterns.length; counter++) {
             if (excludePatterns[counter].toString().equals(soughtexclude))  {
                 return false;
@@ -1761,8 +1748,7 @@ public class DirectoryScanner
     public synchronized String[] getNotFollowedSymlinks() {
         String[] links;
         synchronized (this) {
-            links = notFollowedSymlinks
-                .toArray(new String[notFollowedSymlinks.size()]);
+            links = notFollowedSymlinks.toArray(new String[notFollowedSymlinks.size()]);
         }
         Arrays.sort(links);
         return links;
@@ -1854,12 +1840,12 @@ public class DirectoryScanner
      * @param patterns String[] of patterns.
      * @since Ant 1.8.0
      */
-    private TokenizedPattern[] fillNonPatternSet(final Map<String, TokenizedPath> map, final String[] patterns) {
+    private TokenizedPattern[] fillNonPatternSet(final Map<String, TokenizedPath> map,
+                                                 final String[] patterns) {
         final ArrayList<TokenizedPattern> al = new ArrayList<TokenizedPattern>(patterns.length);
         for (int i = 0; i < patterns.length; i++) {
             if (!SelectorUtils.hasWildcards(patterns[i])) {
-                final String s = isCaseSensitive()
-                    ? patterns[i] : patterns[i].toUpperCase();
+                final String s = isCaseSensitive() ? patterns[i] : patterns[i].toUpperCase();
                 map.put(s, new TokenizedPath(s));
             } else {
                 al.add(new TokenizedPattern(patterns[i]));
@@ -1883,8 +1869,7 @@ public class DirectoryScanner
                                              final LinkedList<String> directoryNamesFollowed) {
         try {
             if (directoryNamesFollowed.size() >= maxLevelsOfSymlinks
-                && CollectionUtils.frequency(directoryNamesFollowed, dirName)
-                   >= maxLevelsOfSymlinks
+                && CollectionUtils.frequency(directoryNamesFollowed, dirName) >= maxLevelsOfSymlinks
                 && SYMLINK_UTILS.isSymbolicLink(parent, dirName)) {
 
                 final ArrayList<String> files = new ArrayList<String>();
@@ -1899,8 +1884,7 @@ public class DirectoryScanner
                         f = FILE_UTILS.resolveFile(parent, relPath + dir);
                         files.add(f.getCanonicalPath());
                         if (files.size() > maxLevelsOfSymlinks
-                            && CollectionUtils.frequency(files, target)
-                                 > maxLevelsOfSymlinks) {
+                            && CollectionUtils.frequency(files, target) > maxLevelsOfSymlinks) {
                             return true;
                         }
                     }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/IntrospectionHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java
index 9740338..ff64e9d 100644
--- a/src/main/org/apache/tools/ant/IntrospectionHelper.java
+++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java
@@ -1125,7 +1125,7 @@ public final class IntrospectionHelper {
                 void set(final Project p, final Object parent, final String value) throws InvocationTargetException,
                         IllegalAccessException, BuildException {
                     m.invoke(parent, new Object[] {new FileResource(p, p.resolveFile(value))});
-                };
+                }
             };
         }
         // EnumeratedAttributes have their own helper class

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/Project.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index b91b83e..461b89a 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -192,12 +192,12 @@ public class Project implements ResourceFactory {
     private ClassLoader coreLoader = null;
 
     /** Records the latest task to be executed on a thread. */
-    private final Map<Thread,Task> threadTasks =
-        Collections.synchronizedMap(new WeakHashMap<Thread, Task>());
+    private final Map<Thread, Task> threadTasks
+            = Collections.synchronizedMap(new WeakHashMap<Thread, Task>());
 
     /** Records the latest task to be executed on a thread group. */
-    private final Map<ThreadGroup,Task> threadGroupTasks
-        = Collections.synchronizedMap(new WeakHashMap<ThreadGroup,Task>());
+    private final Map<ThreadGroup, Task> threadGroupTasks
+            = Collections.synchronizedMap(new WeakHashMap<ThreadGroup,Task>());
 
     /**
      * Called to handle any input requests.

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/RuntimeConfigurable.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
index 302d8f6..6c4953f 100644
--- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java
+++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
@@ -593,8 +593,7 @@ public class RuntimeConfigurable implements Serializable {
 
         // Children (this is a shadow of UnknownElement#children)
         if (r.children != null) {
-            ArrayList<RuntimeConfigurable> newChildren = new ArrayList<RuntimeConfigurable>();
-            newChildren.addAll(r.children);
+            ArrayList<RuntimeConfigurable> newChildren = new ArrayList<RuntimeConfigurable>(r.children);
             if (children != null) {
                 newChildren.addAll(children);
             }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/UnknownElement.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java
index 15770c2..f0a274e 100644
--- a/src/main/org/apache/tools/ant/UnknownElement.java
+++ b/src/main/org/apache/tools/ant/UnknownElement.java
@@ -400,8 +400,7 @@ public class UnknownElement extends Task {
         // Do the runtime
         getWrapper().applyPreSet(u.getWrapper());
         if (u.children != null) {
-            List<UnknownElement> newChildren = new ArrayList<UnknownElement>();
-            newChildren.addAll(u.children);
+            List<UnknownElement> newChildren = new ArrayList<UnknownElement>(u.children);
             if (children != null) {
                 newChildren.addAll(children);
             }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/XmlLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java
index d03067d..51d4776 100644
--- a/src/main/org/apache/tools/ant/XmlLogger.java
+++ b/src/main/org/apache/tools/ant/XmlLogger.java
@@ -466,7 +466,7 @@ public class XmlLogger implements BuildLogger {
     }
 
     private void synchronizedAppend(Node parent, Node child) {
-        synchronized(parent) {
+        synchronized (parent) {
             parent.appendChild(child);
         }
     }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
index 3b3b027..dfd16f1 100644
--- a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
+++ b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
@@ -176,7 +176,7 @@ public abstract class BaseFilterReader extends FilterReader {
         StringBuffer line = new StringBuffer();
 
         while (ch != -1) {
-            line.append ((char) ch);
+            line.append((char) ch);
             if (ch == '\n') {
                 break;
             }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
index f033b6f..a2ac732 100644
--- a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
+++ b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
@@ -87,7 +87,8 @@ public final class ReplaceTokens
      *
      * @see BaseFilterReader#BaseFilterReader()
      */
-    public ReplaceTokens() {}
+    public ReplaceTokens() {
+    }
 
     /**
      * Creates a new filtered reader.
@@ -138,12 +139,12 @@ public final class ReplaceTokens
             if (next == -1) {
                 return next; // end of stream. all buffers empty.
             }
-            readBuffer += (char)next;
+            readBuffer += (char) next;
         }
 
         for (;;) {
             // get the closest tokens
-            SortedMap<String,String> possibleTokens = resolvedTokens.tailMap(readBuffer);
+            SortedMap<String, String> possibleTokens = resolvedTokens.tailMap(readBuffer);
             if (possibleTokens.isEmpty() || !possibleTokens.firstKey().startsWith(readBuffer)) { // if there is none, then deliver the first char from the buffer.
                 return getFirstCharacterFromReadBuffer();
             } else if (readBuffer.equals(possibleTokens.firstKey())) { // there exists a nearest token - is it an exact match?
@@ -156,7 +157,7 @@ public final class ReplaceTokens
             } else { // nearest token is not matching exactly - read one character more.
                 int next = in.read();
                 if (next != -1) {
-                    readBuffer += (char)next;
+                    readBuffer += (char) next;
                 } else {
                     return getFirstCharacterFromReadBuffer(); // end of stream. deliver remaining characters from buffer.
                 }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/launch/Launcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java
index 5c4f6f4..10ca77c 100644
--- a/src/main/org/apache/tools/ant/launch/Launcher.java
+++ b/src/main/org/apache/tools/ant/launch/Launcher.java
@@ -120,7 +120,7 @@ public class Launcher {
         }
         if (exitCode != 0) {
             if (launchDiag) {
-                System.out.println("Exit code: "+exitCode);
+                System.out.println("Exit code: " + exitCode);
             }
             System.exit(exitCode);
         }
@@ -237,7 +237,7 @@ public class Launcher {
             }
         }
 
-        logPath("Launcher JAR",sourceJar);
+        logPath("Launcher JAR", sourceJar);
         logPath("Launcher JAR directory", sourceJar.getParentFile());
         logPath("java.home", new File(System.getProperty("java.home")));
 
@@ -256,7 +256,7 @@ public class Launcher {
         final URL[] userURLs   = noUserLib ? new URL[0] : getUserURLs();
 
         final File toolsJAR = Locator.getToolsJar();
-        logPath("tools.jar",toolsJAR);
+        logPath("tools.jar", toolsJAR);
         final URL[] jars = getJarArray(
             libURLs, userURLs, systemURLs, toolsJAR);
 
@@ -279,7 +279,7 @@ public class Launcher {
         Thread.currentThread().setContextClassLoader(loader);
         Class<?> mainClass = null;
         int exitCode = 0;
-        Throwable thrown=null;
+        Throwable thrown = null;
         try {
             mainClass = loader.loadClass(mainClassname);
             final AntMain main = (AntMain) mainClass.newInstance();
@@ -297,10 +297,10 @@ public class Launcher {
             thrown = cnfe;
         } catch (final Throwable t) {
             t.printStackTrace(System.err); //NOSONAR
-            thrown=t;
+            thrown = t;
         }
-        if(thrown!=null) {
-            System.err.println(ANTHOME_PROPERTY+": "+antHome.getAbsolutePath());
+        if (thrown != null) {
+            System.err.println(ANTHOME_PROPERTY + ": " + antHome.getAbsolutePath());
             System.err.println("Classpath: " + baseClassPath.toString());
             System.err.println("Launcher JAR: " + sourceJar.getAbsolutePath());
             System.err.println("Launcher Directory: " + jarDir.getAbsolutePath());
@@ -374,8 +374,8 @@ public class Launcher {
      * @return a combined array
      * @throws MalformedURLException if there is a problem.
      */
-    private URL[] getJarArray (
-        final URL[] libJars, final URL[] userJars, final URL[] systemJars, final File toolsJar)
+    private URL[] getJarArray(final URL[] libJars, final URL[] userJars,
+        final URL[] systemJars, final File toolsJar)
         throws MalformedURLException {
         int numJars = libJars.length + userJars.length + systemJars.length;
         if (toolsJar != null) {
@@ -405,7 +405,7 @@ public class Launcher {
         System.setProperty(name, value);
     }
 
-    private void logPath(final String name,final File path) {
+    private void logPath(final String name, final File path) {
         if(launchDiag) {
             System.out.println(name+"= \""+path+"\"");
         }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/launch/Locator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java
index 7ea070e..4f5aef4 100644
--- a/src/main/org/apache/tools/ant/launch/Locator.java
+++ b/src/main/org/apache/tools/ant/launch/Locator.java
@@ -401,8 +401,7 @@ public final class Locator {
      * @deprecated since 1.9, use <code>FileUtils.getFileURL(File)</code>
      */
     @Deprecated
-    public static URL fileToURL(File file)
-        throws MalformedURLException {
+    public static URL fileToURL(File file) throws MalformedURLException {
         return new URL(file.toURI().toASCIIString());
     }
 

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
index 86fd684..cb4baa1 100644
--- a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
+++ b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
@@ -103,8 +103,7 @@ public class CommonsLoggingListener implements BuildListener, BuildLogger {
 
     /** {@inheritDoc}. */
     public void buildStarted(final BuildEvent event) {
-        final String categoryString = PROJECT_LOG;
-        final Log log = getLog(categoryString, null);
+        final Log log = getLog(PROJECT_LOG, null);
 
         if (initialized) {
             realLog(log, "Build started.", Project.MSG_INFO, null);
@@ -114,8 +113,7 @@ public class CommonsLoggingListener implements BuildListener, BuildLogger {
     /** {@inheritDoc}. */
     public void buildFinished(final BuildEvent event) {
         if (initialized) {
-            final String categoryString = PROJECT_LOG;
-            final Log log = getLog(categoryString, event.getProject().getName());
+            final Log log = getLog(PROJECT_LOG, event.getProject().getName());
 
             if (event.getException() == null) {
                 realLog(log, "Build finished.", Project.MSG_INFO, null);
@@ -245,7 +243,7 @@ public class CommonsLoggingListener implements BuildListener, BuildLogger {
             final Log log = getLog(categoryString, categoryDetail);
             final int priority = event.getPriority();
             final String message = event.getMessage();
-            realLog(log, message, priority , null);
+            realLog(log, message, priority, null);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Ant.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java
index dbf8a22..78d0689 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Ant.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java
@@ -369,7 +369,7 @@ public class Ant extends Task {
             log("calling target(s) "
                 + ((locals.size() > 0) ? locals.toString() : "[default]")
                 + " in build file " + antFile, Project.MSG_VERBOSE);
-            newProject.setUserProperty(MagicNames.ANT_FILE , antFile);
+            newProject.setUserProperty(MagicNames.ANT_FILE, antFile);
 
             String thisAntFile = getProject().getProperty(MagicNames.ANT_FILE);
             // Are we trying to call the target in which we are defined (or

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
index 45ad9ae..3c07e28 100644
--- a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
+++ b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
@@ -82,9 +82,8 @@ public class BindTargets extends Task {
                 ProjectHelper.PROJECTHELPER_REFERENCE);
 
         for (final Iterator<String> itTarget = targets.iterator(); itTarget.hasNext();) {
-            helper.getExtensionStack().add(
-                    new String[] {extensionPoint, itTarget.next(),
-                                            onMissingExtensionPoint.name()});
+            helper.getExtensionStack().add(new String[] {extensionPoint,
+                    itTarget.next(), onMissingExtensionPoint.name()});
         }
 
     }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
index af24504..e39adef 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
@@ -114,7 +114,7 @@ public class CVSPass extends Task {
             String pwdfile = buf.toString() + cvsRoot + " A"
                 + mangle(password);
 
-            log("Writing -> " + pwdfile , Project.MSG_DEBUG);
+            log("Writing -> " + pwdfile, Project.MSG_DEBUG);
 
             writer = new BufferedWriter(new FileWriter(passFile));
 

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Checksum.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
index 7a94ca0..bd95e93 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
@@ -490,7 +490,7 @@ public class Checksum extends MatchingTask implements Condition {
                 dis.close();
                 fis.close();
                 fis = null;
-                byte[] fileDigest = messageDigest.digest ();
+                byte[] fileDigest = messageDigest.digest();
                 if (totalproperty != null) {
                     allDigests.put(src, fileDigest);
                 }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Classloader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Classloader.java b/src/main/org/apache/tools/ant/taskdefs/Classloader.java
index 99d47a1..57bbf90 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Classloader.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Classloader.java
@@ -229,7 +229,7 @@ public class Classloader extends Task {
                 for (int i = 0; i < list.length; i++) {
                     File f = new File(list[i]);
                     if (f.exists()) {
-                        log("Adding to class loader " +  acl + " " + f.getAbsolutePath(),
+                        log("Adding to class loader " + acl + " " + f.getAbsolutePath(),
                                 Project.MSG_DEBUG);
                         acl.addPathElement(f.getAbsolutePath());
                     }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Definer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java
index e4e3ea3..98a22be 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Definer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Definer.java
@@ -121,7 +121,8 @@ public abstract class Definer extends DefBase {
          * @return an array of the allowed values for this attribute.
          */
         public String[] getValues() {
-            return new String[] {POLICY_FAIL, POLICY_REPORT, POLICY_IGNORE, POLICY_FAILALL};
+            return new String[] {POLICY_FAIL, POLICY_REPORT, POLICY_IGNORE,
+                    POLICY_FAILALL};
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Delete.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java
index 3329318..b22c7cc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Delete.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java
@@ -559,8 +559,7 @@ public class Delete extends MatchingTask {
         }
 
         if (quiet && failonerror) {
-            throw new BuildException("quiet and failonerror cannot both be "
-                                     + "set to true", getLocation());
+            throw new BuildException("quiet and failonerror cannot both be set to true", getLocation());
         }
 
         // delete the single file
@@ -609,8 +608,7 @@ public class Delete extends MatchingTask {
                     + " which looks like a broken symlink.",
                     quiet ? Project.MSG_VERBOSE : verbosity);
                 if (!delete(dir)) {
-                    handle("Unable to delete directory "
-                           + dir.getAbsolutePath());
+                    handle("Unable to delete directory " + dir.getAbsolutePath());
                 }
             }
         }
@@ -638,13 +636,11 @@ public class Delete extends MatchingTask {
                 fs.setProject(getProject());
             }
             final File fsDir = fs.getDir();
-            if (!fs.getErrorOnMissingDir() &&
-                (fsDir == null || !fsDir.exists())) {
+            if (!fs.getErrorOnMissingDir() && (fsDir == null || !fsDir.exists())) {
                 continue;
             }
             if (fsDir == null) {
-                throw new BuildException(
-                        "File or Resource without directory or file specified");
+                throw new BuildException("File or Resource without directory or file specified");
             } else if (!fsDir.isDirectory()) {
                 handle("Directory does not exist: " + fsDir);
             } else {
@@ -657,9 +653,11 @@ public class Delete extends MatchingTask {
                         public boolean isFilesystemOnly() {
                             return true;
                         }
+
                         public int size() {
                             return files.length;
                         }
+
                         public Iterator<Resource> iterator() {
                             return new FileResourceIterator(getProject(),
                                                             fsDir, files);
@@ -667,8 +665,7 @@ public class Delete extends MatchingTask {
                     });
                 if (includeEmpty) {
                     filesetDirs.add(new ReverseDirs(getProject(), fsDir,
-                                                    ds
-                                                    .getIncludedDirectories()));
+                            ds.getIncludedDirectories()));
                 }
 
                 if (removeNotFollowedSymlinks) {
@@ -706,8 +703,7 @@ public class Delete extends MatchingTask {
                 for (Resource r : resourcesToDelete) {
                     // nonexistent resources could only occur if we already
                     // deleted something from a fileset:
-                    File f = r.as(FileProvider.class)
-                              .getFile();
+                    File f = r.as(FileProvider.class).getFile();
                     if (!f.exists()) {
                         continue;
                     }
@@ -741,8 +737,7 @@ public class Delete extends MatchingTask {
 
     private void handle(Exception e) {
         if (failonerror) {
-            throw (e instanceof BuildException)
-                ? (BuildException) e : new BuildException(e);
+            throw (e instanceof BuildException) ? (BuildException) e : new BuildException(e);
         }
         log(e, quiet ? Project.MSG_VERBOSE : verbosity);
     }
@@ -825,8 +820,7 @@ public class Delete extends MatchingTask {
                     log("Deleting " + currDir.getAbsolutePath(),
                             quiet ? Project.MSG_VERBOSE : verbosity);
                     if (!delete(currDir)) {
-                        handle("Unable to delete directory "
-                                + currDir.getAbsolutePath());
+                        handle("Unable to delete directory " + currDir.getAbsolutePath());
                     } else {
                         dirCount++;
                     }
@@ -834,8 +828,7 @@ public class Delete extends MatchingTask {
             }
 
             if (dirCount > 0) {
-                log("Deleted "
-                     + dirCount
+                log("Deleted " + dirCount
                      + " director" + (dirCount == 1 ? "y" : "ies")
                      + " form " + d.getAbsolutePath(),
                      quiet ? Project.MSG_VERBOSE : verbosity);

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/EchoXML.java b/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
index 40939e4..5524c0d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
+++ b/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
@@ -108,7 +108,8 @@ public class EchoXML extends XMLFragment {
         public static final NamespacePolicy DEFAULT
             = new NamespacePolicy(IGNORE);
 
-        public NamespacePolicy() {}
+        public NamespacePolicy() {
+        }
 
         public NamespacePolicy(String s) {
             setValue(s);

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
index b36f2fe..2f65308 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
@@ -318,7 +318,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver {
         exe.setVMLauncher(true);
         File vmsJavaOptionFile = null;
         try {
-            String [] args = new String[command.length - 1];
+            String[] args = new String[command.length - 1];
             System.arraycopy(command, 1, args, 0, command.length - 1);
             vmsJavaOptionFile = JavaEnvUtils.createVmsJavaOptionFile(args);
             //we mark the file to be deleted on exit.
@@ -326,7 +326,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver {
             //after execution finished, which is much better for long-lived runtimes
             //though spawning complicates things...
             vmsJavaOptionFile.deleteOnExit();
-            String [] vmsCmd = {command[0], "-V", vmsJavaOptionFile.getPath()};
+            String[] vmsCmd = {command[0], "-V", vmsJavaOptionFile.getPath()};
             exe.setCommandline(vmsCmd);
         } catch (IOException e) {
             throw new BuildException("Failed to create a temporary file for \"-V\" switch");

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
index 18cbd29..39cc03a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
@@ -328,8 +328,7 @@ public class ExecuteOn extends ExecTask {
      */
     protected ExecuteStreamHandler createHandler() throws BuildException {
         //if we have a RedirectorElement, return a decoy
-        return (redirectorElement == null)
-            ? super.createHandler() : new PumpStreamHandler();
+        return (redirectorElement == null) ? super.createHandler() : new PumpStreamHandler();
     }
 
     /**
@@ -394,8 +393,7 @@ public class ExecuteOn extends ExecTask {
                     fileNames.copyInto(s);
                     for (int j = 0; j < s.length; j++) {
                         String[] command = getCommandline(s[j], base);
-                        log(Commandline.describeCommand(command),
-                            Project.MSG_VERBOSE);
+                        log(Commandline.describeCommand(command), Project.MSG_VERBOSE);
                         exe.setCommandline(command);
 
                         if (redirectorElement != null) {
@@ -438,11 +436,9 @@ public class ExecuteOn extends ExecTask {
                         continue;
                     }
 
-                    if ((!res.isDirectory() || !res.isExists())
-                        && !FileDirBoth.DIR.equals(type)) {
+                    if ((!res.isDirectory() || !res.isExists()) && !FileDirBoth.DIR.equals(type)) {
                         totalFiles++;
-                    } else if (res.isDirectory()
-                               && !FileDirBoth.FILE.equals(type)) {
+                    } else if (res.isDirectory() && !FileDirBoth.FILE.equals(type)) {
                         totalDirs++;
                     } else {
                         continue;
@@ -453,8 +449,7 @@ public class ExecuteOn extends ExecTask {
 
                     if (!parallel) {
                         String[] command = getCommandline(name, base);
-                        log(Commandline.describeCommand(command),
-                            Project.MSG_VERBOSE);
+                        log(Commandline.describeCommand(command), Project.MSG_VERBOSE);
                         exe.setCommandline(command);
 
                         if (redirectorElement != null) {
@@ -479,10 +474,8 @@ public class ExecuteOn extends ExecTask {
                 haveExecuted = true;
             }
             if (haveExecuted) {
-                log("Applied " + cmdl.getExecutable() + " to "
-                    + totalFiles + " file"
-                    + (totalFiles != 1 ? "s" : "") + " and "
-                    + totalDirs + " director"
+                log("Applied " + cmdl.getExecutable() + " to " + totalFiles + " file"
+                    + (totalFiles != 1 ? "s" : "") + " and " + totalDirs + " director"
                     + (totalDirs != 1 ? "ies" : "y") + ".",
                     verbose ? Project.MSG_INFO : Project.MSG_VERBOSE);
             }
@@ -504,11 +497,8 @@ public class ExecuteOn extends ExecTask {
      */
     private void logSkippingFileset(
         String currentType, DirectoryScanner ds, File base) {
-        int includedCount
-            = ((!FileDirBoth.DIR.equals(currentType))
-               ? ds.getIncludedFilesCount() : 0)
-            + ((!FileDirBoth.FILE.equals(currentType))
-               ? ds.getIncludedDirsCount() : 0);
+        int includedCount = (!FileDirBoth.DIR.equals(currentType) ? ds.getIncludedFilesCount() : 0)
+                + (!FileDirBoth.FILE.equals(currentType) ? ds.getIncludedDirsCount() : 0);
 
         log("Skipping fileset for directory " + base + ". It is "
             + ((includedCount > 0) ? "up to date." : "empty."),
@@ -624,9 +614,8 @@ public class ExecuteOn extends ExecTask {
             if (forwardSlash && fileSeparator != '/') {
                 src = src.replace(fileSeparator, '/');
             }
-            if (srcFilePos != null &&
-                (srcFilePos.getPrefix().length() > 0
-                 || srcFilePos.getSuffix().length() > 0)) {
+            if (srcFilePos != null && (srcFilePos.getPrefix().length() > 0
+                    || srcFilePos.getSuffix().length() > 0)) {
                 src = srcFilePos.getPrefix() + src + srcFilePos.getSuffix();
             }
             result[srcIndex + i] = src;
@@ -702,8 +691,7 @@ public class ExecuteOn extends ExecTask {
         File[] b = new File[baseDirs.size()];
         baseDirs.copyInto(b);
 
-        if (maxParallel <= 0
-            || s.length == 0 /* this is skipEmpty == false */) {
+        if (maxParallel <= 0 || s.length == 0 /* this is skipEmpty == false */) {
             String[] command = getCommandline(s, b);
             log(Commandline.describeCommand(command), Project.MSG_VERBOSE);
             exe.setCommandline(command);

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
index 236b125..867c579 100644
--- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -687,8 +687,8 @@ public class FixCRLF extends MatchingTask implements ChainableReader {
          * {@inheritDoc}.
          */
         public String[] getValues() {
-            return new String[] {"asis", "cr", "lf", "crlf",
-                                 "mac", "unix", "dos"};
+            return new String[] {"asis", "cr", "lf", "crlf", "mac", "unix",
+                    "dos"};
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Get.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java
index 26a20e4..13f610c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -349,7 +348,7 @@ public class Get extends Task {
      * @param v if "true" then be quiet
      * @since Ant 1.9.4
      */
-    public void setQuiet(final boolean v){
+    public void setQuiet(final boolean v) {
         this.quiet = v;
     }
 
@@ -626,8 +625,8 @@ public class Get extends Task {
         private int redirections = 0;
         private String userAgent = null;
 
-        GetThread(final URL source, final File dest,
-                  final boolean h, final long t, final DownloadProgress p, final int l, final String userAgent) {
+        GetThread(final URL source, final File dest, final boolean h,
+                  final long t, final DownloadProgress p, final int l, final String userAgent) {
             this.source = source;
             this.dest = dest;
             hasTimestamp = h;
@@ -670,34 +669,29 @@ public class Get extends Task {
 
 
         private boolean redirectionAllowed(final URL aSource, final URL aDest) {
-            if (!(aSource.getProtocol().equals(aDest.getProtocol()) || (HTTP
-                    .equals(aSource.getProtocol()) && HTTPS.equals(aDest
-                    .getProtocol())))) {
-                final String message = "Redirection detected from "
-                        + aSource.getProtocol() + " to " + aDest.getProtocol()
-                        + ". Protocol switch unsafe, not allowed.";
-                if (ignoreErrors) {
-                    log(message, logLevel);
-                    return false;
-                } else {
+            if (aSource.getProtocol().equals(aDest.getProtocol())
+                    && (HTTP.equals(aSource.getProtocol()) || HTTPS.equals(aDest.getProtocol()))) {
+                redirections++;
+                if (redirections > REDIRECT_LIMIT) {
+                    final String message = "More than " + REDIRECT_LIMIT
+                            + " times redirected, giving up";
+                    if (ignoreErrors) {
+                        log(message, logLevel);
+                        return false;
+                    }
                     throw new BuildException(message);
                 }
+                return true;
             }
 
-            redirections++;
-            if (redirections > REDIRECT_LIMIT) {
-                final String message = "More than " + REDIRECT_LIMIT
-                        + " times redirected, giving up";
-                if (ignoreErrors) {
-                    log(message, logLevel);
-                    return false;
-                } else {
-                    throw new BuildException(message);
-                }
+            final String message = "Redirection detected from "
+                    + aSource.getProtocol() + " to " + aDest.getProtocol()
+                    + ". Protocol switch unsafe, not allowed.";
+            if (ignoreErrors) {
+                log(message, logLevel);
+                return false;
             }
-
-
-            return true;
+            throw new BuildException(message);
         }
 
         private URLConnection openConnection(final URL aSource) throws IOException {
@@ -721,8 +715,7 @@ public class Get extends Task {
                 // testing
                 final Base64Converter encoder = new Base64Converter();
                 encoding = encoder.encode(up.getBytes());
-                connection.setRequestProperty("Authorization", "Basic "
-                        + encoding);
+                connection.setRequestProperty("Authorization", "Basic " + encoding);
             }
 
             if (tryGzipEncoding) {
@@ -730,10 +723,8 @@ public class Get extends Task {
             }
 
             if (connection instanceof HttpURLConnection) {
-                ((HttpURLConnection) connection)
-                        .setInstanceFollowRedirects(false);
-                ((HttpURLConnection) connection)
-                        .setUseCaches(httpUseCaches);
+                ((HttpURLConnection) connection).setInstanceFollowRedirects(false);
+                connection.setUseCaches(httpUseCaches);
             }
             // connect to the remote site (may take some time)
             try {
@@ -791,14 +782,13 @@ public class Get extends Task {
         }
 
         private boolean isMoved(final int responseCode) {
-            return responseCode == HttpURLConnection.HTTP_MOVED_PERM ||
-                responseCode == HttpURLConnection.HTTP_MOVED_TEMP ||
-                responseCode == HttpURLConnection.HTTP_SEE_OTHER ||
-                responseCode == HTTP_MOVED_TEMP;
+            return responseCode == HttpURLConnection.HTTP_MOVED_PERM
+                    || responseCode == HttpURLConnection.HTTP_MOVED_TEMP
+                    || responseCode == HttpURLConnection.HTTP_SEE_OTHER
+                    || responseCode == HTTP_MOVED_TEMP;
         }
 
-        private boolean downloadFile()
-                throws FileNotFoundException, IOException {
+        private boolean downloadFile() throws IOException {
             for (int i = 0; i < numberRetries; i++) {
                 // this three attempt trick is to get round quirks in different
                 // Java implementations. Some of them take a few goes to bind
@@ -855,9 +845,7 @@ public class Get extends Task {
             if (verbose)  {
                 final Date t = new Date(remoteTimestamp);
                 log("last modified = " + t.toString()
-                    + ((remoteTimestamp == 0)
-                       ? " - using current time instead"
-                       : ""), logLevel);
+                    + ((remoteTimestamp == 0) ? " - using current time instead" : ""), logLevel);
             }
             if (remoteTimestamp != 0) {
                 FILE_UTILS.setFileLastModified(dest, remoteTimestamp);

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/HostInfo.java b/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
index 43a1211..1391298 100644
--- a/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
@@ -242,7 +242,7 @@ public class HostInfo extends Task {
         int idx = fqdn.indexOf('.');
         if (idx > 0) {
             setProperty(NAME, fqdn.substring(0, idx));
-            setProperty(DOMAIN, fqdn.substring(idx+1));
+            setProperty(DOMAIN, fqdn.substring(idx + 1));
         } else {
             setProperty(NAME, fqdn);
             setProperty(DOMAIN, DEF_DOMAIN);

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Input.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Input.java b/src/main/org/apache/tools/ant/taskdefs/Input.java
index ed05131..2f5eea0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Input.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Input.java
@@ -122,11 +122,10 @@ public class Input extends Task {
     public static class HandlerType extends EnumeratedAttribute {
         private static final String[] VALUES = {"default", "propertyfile", "greedy", "secure"};
 
-        private static final InputHandler[] HANDLERS
-            = {new DefaultInputHandler(),
-               new PropertyFileInputHandler(),
-               new GreedyInputHandler(),
-               new SecureInputHandler()};
+        private static final InputHandler[] HANDLERS = {new DefaultInputHandler(),
+                new PropertyFileInputHandler(),
+                new GreedyInputHandler(),
+                new SecureInputHandler()};
 
         /** {@inheritDoc} */
         @Override
@@ -153,7 +152,7 @@ public class Input extends Task {
      *
      * @param validargs A comma separated String defining valid input args.
      */
-    public void setValidargs (final String validargs) {
+    public void setValidargs(final String validargs) {
         this.validargs = validargs;
     }
 
@@ -164,7 +163,7 @@ public class Input extends Task {
      *
      * @param addproperty Name for the property to be created from input
      */
-    public void setAddproperty (final String addproperty) {
+    public void setAddproperty(final String addproperty) {
         this.addproperty = addproperty;
     }
 
@@ -172,7 +171,7 @@ public class Input extends Task {
      * Sets the Message which gets displayed to the user during the build run.
      * @param message The message to be displayed.
      */
-    public void setMessage (final String message) {
+    public void setMessage(final String message) {
         this.message = message;
         messageAttribute = true;
     }
@@ -184,7 +183,7 @@ public class Input extends Task {
      * @param defaultvalue Default value for the property if no input
      * is received
      */
-    public void setDefaultvalue (final String defaultvalue) {
+    public void setDefaultvalue(final String defaultvalue) {
         this.defaultvalue = defaultvalue;
     }
 
@@ -210,7 +209,7 @@ public class Input extends Task {
      * @throws BuildException on error
      */
     @Override
-    public void execute () throws BuildException {
+    public void execute() throws BuildException {
         if (addproperty != null
             && getProject().getProperty(addproperty) != null) {
             log("skipping " + getTaskName() + " as property " + addproperty

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Jar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index 791fd0d..f31ac6f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -1180,9 +1180,7 @@ public class Jar extends Zip {
             if (rcs[i] instanceof FileSet) {
                 resources = grabResources(new FileSet[] {(FileSet) rcs[i]});
             } else {
-                resources = grabNonFileSetResources(new ResourceCollection[] {
-                        rcs[i]
-                    });
+                resources = grabNonFileSetResources(new ResourceCollection[] {rcs[i]});
             }
             for (int j = 0; j < resources[0].length; j++) {
                 String name = resources[0][j].getName().replace('\\', '/');
@@ -1227,7 +1225,7 @@ public class Jar extends Zip {
          * @return the list of values.
          */
         public String[] getValues() {
-            return new String[]{"fail", "warn", "ignore"};
+            return new String[] {"fail", "warn", "ignore"};
         }
         /**
          * @return The log level according to the strict mode.

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Javac.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 7ccc5a1..0237ab6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -1671,9 +1671,8 @@ public class Javac extends MatchingTask {
                 throw new BuildException("The modulesourcepath entry must contain at most one module mark");
             }
             final String pathToModule = pattern.substring(0, startIndex);
-            final String pathInModule = endIndex == pattern.length() ?
-                    null :
-                    pattern.substring(endIndex + 1);  //+1 the separator
+            final String pathInModule = endIndex == pattern.length()
+                    ? null : pattern.substring(endIndex + 1);  //+1 the separator
             findModules(root, pathToModule, pathInModule, collector);
         }
     }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index d5e77fd..931449f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1334,7 +1334,7 @@ public class Javadoc extends Task {
         private String scope = "a";
 
         /** Sole constructor. */
-        public TagArgument () {
+        public TagArgument() {
             //empty
         }
 
@@ -1344,7 +1344,7 @@ public class Javadoc extends Task {
          * @param name The name of the tag.
          *             Must not be <code>null</code> or empty.
          */
-        public void setName (final String name) {
+        public void setName(final String name) {
             this.name = name;
         }
 
@@ -1364,7 +1364,7 @@ public class Javadoc extends Task {
          * elements are specified, or if any unrecognised elements are
          * specified.
          */
-        public void setScope (String verboseScope) throws BuildException {
+        public void setScope(String verboseScope) throws BuildException {
             verboseScope = verboseScope.toLowerCase(Locale.ENGLISH);
 
             final boolean[] elements = new boolean[SCOPE_ELEMENTS.length];
@@ -1374,7 +1374,7 @@ public class Javadoc extends Task {
 
             // Go through the tokens one at a time, updating the
             // elements array and issuing warnings where appropriate.
-            final StringTokenizer tok = new StringTokenizer (verboseScope, ",");
+            final StringTokenizer tok = new StringTokenizer(verboseScope, ",");
             while (tok.hasMoreTokens()) {
                 final String next = tok.nextToken().trim();
                 if (next.equals("all")) {
@@ -1430,7 +1430,7 @@ public class Javadoc extends Task {
          *
          * @param enabled Whether or not this tag is enabled.
          */
-        public void setEnabled (final boolean enabled) {
+        public void setEnabled(final boolean enabled) {
             this.enabled = enabled;
         }
 

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
index 64fbf7c..4e331da 100644
--- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
+++ b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
@@ -176,18 +176,18 @@ public class KeySubst extends Task {
         while ((index = origString.indexOf("${", i)) > -1) {
             key = origString.substring(index + 2, origString.indexOf("}",
                                        index + 3));
-            finalString.append (origString.substring(i, index));
+            finalString.append(origString.substring(i, index));
             if (keys.containsKey(key)) {
-                finalString.append (keys.get(key));
+                finalString.append(keys.get(key));
             } else {
-                finalString.append ("${");
-                finalString.append (key);
-                finalString.append ("}");
+                finalString.append("${");
+                finalString.append(key);
+                finalString.append("}");
             }
             i = index + 3 + key.length();
         }
         // CheckStyle:MagicNumber ON
-        finalString.append (origString.substring(i));
+        finalString.append(origString.substring(i));
         return finalString.toString();
     }
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
index abbc5fd..0fc1f5b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
@@ -170,7 +170,7 @@ public class PathConvert extends Task {
          */
         @Override
         public String[] getValues() {
-            return new String[]{"windows", "unix", "netware", "os/2", "tandem"};
+            return new String[] {"windows", "unix", "netware", "os/2", "tandem"};
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Replace.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java
index b2474a5..6ea6f65 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -514,7 +514,7 @@ public class Replace extends MatchingTask {
                 Properties props = getProperties(replaceFilterResource);
                 Iterator e = getOrderedIterator(props);
                 while (e.hasNext()) {
-                    String tok =  e.next().toString();
+                    String tok = e.next().toString();
                     Replacefilter replaceFilter = createReplacefilter();
                     replaceFilter.setToken(tok);
                     replaceFilter.setValue(props.getProperty(tok));

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index 2f247c9..e801ac0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -1109,9 +1109,9 @@ public class SQLExec extends JDBCTask {
     public int lastDelimiterPosition(StringBuffer buf, String currentLine) {
         if (strictDelimiterMatching) {
             if ((delimiterType.equals(DelimiterType.NORMAL)
-                 && StringUtils.endsWith(buf, delimiter)) ||
-                (delimiterType.equals(DelimiterType.ROW)
-                 && currentLine.equals(delimiter))) {
+                    && StringUtils.endsWith(buf, delimiter))
+                    || (delimiterType.equals(DelimiterType.ROW)
+                    && currentLine.equals(delimiter))) {
                 return buf.length() - delimiter.length();
             }
             // no match
@@ -1123,17 +1123,15 @@ public class SQLExec extends JDBCTask {
                 // StringUtils.endsWith
                 int endIndex = delimiter.length() - 1;
                 int bufferIndex = buf.length() - 1;
-                while (bufferIndex >= 0
-                       && Character.isWhitespace(buf.charAt(bufferIndex))) {
+                while (bufferIndex >= 0 && Character.isWhitespace(buf.charAt(bufferIndex))) {
                     --bufferIndex;
                 }
                 if (bufferIndex < endIndex) {
                     return -1;
                 }
                 while (endIndex >= 0) {
-                    if (buf.substring(bufferIndex, bufferIndex + 1)
-                        .toLowerCase(Locale.ENGLISH).charAt(0)
-                        != d.charAt(endIndex)) {
+                    if (buf.substring(bufferIndex, bufferIndex + 1).toLowerCase(Locale.ENGLISH)
+                            .charAt(0) != d.charAt(endIndex)) {
                         return -1;
                     }
                     bufferIndex--;

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
index 59d886b..676b5fb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
+++ b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
@@ -143,7 +143,7 @@ public class StreamPumper implements Runnable {
             }
             // On completion, drain any available data (which might be the first data available for quick executions)
             if (finish) {
-                while((length = is.available()) > 0) {
+                while ((length = is.available()) > 0) {
                     if (Thread.interrupted()) {
                         break;
                     }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Tar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java
index 9754702..0d319d1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java
@@ -987,7 +987,7 @@ public class Tar extends MatchingTask {
          */
         @Override
         public String[] getValues() {
-            return new String[] {NONE, GZIP, BZIP2 };
+            return new String[] {NONE, GZIP, BZIP2};
         }
 
         /**

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index f86ed03..aee2607 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -77,14 +77,14 @@ public class Tstamp extends Task {
                 cts.execute(getProject(), d, getLocation());
             }
 
-            SimpleDateFormat dstamp = new SimpleDateFormat ("yyyyMMdd");
+            SimpleDateFormat dstamp = new SimpleDateFormat("yyyyMMdd");
             setProperty("DSTAMP", dstamp.format(d));
 
-            SimpleDateFormat tstamp = new SimpleDateFormat ("HHmm");
+            SimpleDateFormat tstamp = new SimpleDateFormat("HHmm");
             setProperty("TSTAMP", tstamp.format(d));
 
             SimpleDateFormat today
-                = new SimpleDateFormat ("MMMM d yyyy", Locale.US);
+                = new SimpleDateFormat("MMMM d yyyy", Locale.US);
             setProperty("TODAY", today.format(d));
 
         } catch (Exception e) {
@@ -189,16 +189,14 @@ public class Tstamp extends Task {
                     if (st.hasMoreElements()) {
                         variant = st.nextToken();
                         if (st.hasMoreElements()) {
-                            throw new BuildException("bad locale format",
-                                                      getLocation());
+                            throw new BuildException("bad locale format", getLocation());
                         }
                     }
                 } else {
                     country = "";
                 }
             } catch (NoSuchElementException e) {
-                throw new BuildException("bad locale format", e,
-                                         getLocation());
+                throw new BuildException("bad locale format", e, getLocation());
             }
         }
 
@@ -266,25 +264,20 @@ public class Tstamp extends Task {
          */
         public void execute(Project project, Date date, Location location) {
             if (propertyName == null) {
-                throw new BuildException("property attribute must be provided",
-                                         location);
+                throw new BuildException("property attribute must be provided", location);
             }
 
             if (pattern == null) {
-                throw new BuildException("pattern attribute must be provided",
-                                         location);
+                throw new BuildException("pattern attribute must be provided", location);
             }
 
             SimpleDateFormat sdf;
             if (language == null) {
                 sdf = new SimpleDateFormat(pattern);
             } else if (variant == null) {
-                sdf = new SimpleDateFormat(pattern,
-                                           new Locale(language, country));
+                sdf = new SimpleDateFormat(pattern, new Locale(language, country));
             } else {
-                sdf = new SimpleDateFormat(pattern,
-                                           new Locale(language, country,
-                                                      variant));
+                sdf = new SimpleDateFormat(pattern, new Locale(language, country, variant));
             }
             if (offset != 0) {
                 Calendar calendar = Calendar.getInstance();

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/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 676f6ae..8394314 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -1310,10 +1310,10 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
                 if (p.shouldUse()) {
                     final Object evaluatedParam = evaluateParam(p);
                     if (liaison instanceof XSLTLiaison4) {
-                        ((XSLTLiaison4)liaison).addParam(p.getName(), evaluatedParam);
+                        ((XSLTLiaison4) liaison).addParam(p.getName(), evaluatedParam);
                     } else {
                         if (evaluatedParam == null || evaluatedParam instanceof String) {
-                            liaison.addParam(p.getName(), (String)evaluatedParam);
+                            liaison.addParam(p.getName(), (String) evaluatedParam);
                         } else {
                             log("XSLTLiaison '" + liaison.getClass().getName()
                                     + "' supports only String parameters. Converting parameter '" + p.getName()
@@ -1398,7 +1398,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
             final String fileName = FileUtils.getRelativePath(baseDir, inFile);
             final File file = new File(fileName);
             // Give always a slash as file separator, so the stylesheet could be sure about that
-            // Use '.' so a dir+"/"+name would not result in an absolute path
+            // Use '.' so a dir + "/" + name would not result in an absolute path
             liaison.addParam(fileDirParameter, file.getParent() != null ? file.getParent().replace(
                     '\\', '/') : ".");
         }

http://git-wip-us.apache.org/repos/asf/ant/blob/5eef12a9/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
index c919d33..6f64a88 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
@@ -335,7 +335,7 @@ public class XmlProperty extends org.apache.tools.ant.Task {
      * either a String if this node resulted in setting an attribute,
      * or a Path.
      */
-    public Object processNode (Node node, String prefix, Object container) {
+    public Object processNode(Node node, String prefix, Object container) {
 
         // Parse the attribute(s) and text of this node, adding
         // properties for each.
@@ -465,7 +465,7 @@ public class XmlProperty extends org.apache.tools.ant.Task {
      * Actually add the given property/value to the project
      * after writing a log message.
      */
-    private void addProperty (String name, String value, String id) {
+    private void addProperty(String name, String value, String id) {
         String msg = name + ":" + value;
         if (id != null) {
             msg += ("(id=" + id + ")");
@@ -502,7 +502,7 @@ public class XmlProperty extends org.apache.tools.ant.Task {
      * Otherwise, we return "(nodename)".  This is long-standing
      * (and default) &lt;xmlproperty&gt; behavior.
      */
-    private String getAttributeName (Node attributeNode) {
+    private String getAttributeName(Node attributeNode) {
         String attributeName = attributeNode.getNodeName();
 
         if (semanticAttributes) {
@@ -523,7 +523,7 @@ public class XmlProperty extends org.apache.tools.ant.Task {
     /**
      * Return whether the provided attribute name is recognized or not.
      */
-    private static boolean isSemanticAttribute (String attributeName) {
+    private static boolean isSemanticAttribute(String attributeName) {
         for (int i = 0; i < ATTRIBUTES.length; i++) {
             if (attributeName.equals(ATTRIBUTES[i])) {
                 return true;
@@ -544,7 +544,7 @@ public class XmlProperty extends org.apache.tools.ant.Task {
      * resolved to absolute file names.  Also for refid values, look
      * up the referenced object from the project.</p>
      */
-    private String getAttributeValue (Node attributeNode) {
+    private String getAttributeValue(Node attributeNode) {
         String nodeValue = attributeNode.getNodeValue().trim();
         if (semanticAttributes) {
             String attributeName = attributeNode.getNodeName();
@@ -673,7 +673,7 @@ public class XmlProperty extends org.apache.tools.ant.Task {
     /**
      * @return the file attribute.
      */
-    protected File getFile () {
+    protected File getFile() {
         FileProvider fp = src.as(FileProvider.class);
         return fp != null ? fp.getFile() : null;
     }
@@ -693,42 +693,42 @@ public class XmlProperty extends org.apache.tools.ant.Task {
     /**
      * @return the prefix attribute.
      */
-    protected String getPrefix () {
+    protected String getPrefix() {
         return this.prefix;
     }
 
     /**
      * @return the keeproot attribute.
      */
-    protected boolean getKeeproot () {
+    protected boolean getKeeproot() {
         return this.keepRoot;
     }
 
     /**
      * @return the validate attribute.
      */
-    protected boolean getValidate () {
+    protected boolean getValidate() {
         return this.validate;
     }
 
     /**
      * @return the collapse attributes attribute.
      */
-    protected boolean getCollapseAttributes () {
+    protected boolean getCollapseAttributes() {
         return this.collapseAttributes;
     }
 
     /**
      * @return the semantic attributes attribute.
      */
-    protected boolean getSemanticAttributes () {
+    protected boolean getSemanticAttributes() {
         return this.semanticAttributes;
     }
 
     /**
      * @return the root directory attribute.
      */
-    protected File getRootDirectory () {
+    protected File getRootDirectory() {
         return this.rootDirectory;
     }
 


Mime
View raw message