ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject [1/2] ant git commit: whitespace
Date Wed, 19 Apr 2017 13:30:42 GMT
Repository: ant
Updated Branches:
  refs/heads/master b7d1e9bde -> 8d49bb80c


whitespace


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

Branch: refs/heads/master
Commit: ee47fa6e1a3828f7f52d4c3a8307074603e70740
Parents: b7d1e9b
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Wed Apr 19 15:30:15 2017 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Wed Apr 19 15:30:15 2017 +0200

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/XmlLogger.java    |  2 +-
 .../ant/filters/util/ChainReaderHelper.java     |  6 +-
 src/main/org/apache/tools/ant/taskdefs/Ant.java |  2 +-
 .../apache/tools/ant/taskdefs/AntStructure.java |  2 +-
 .../org/apache/tools/ant/taskdefs/Antlib.java   |  2 +-
 .../org/apache/tools/ant/taskdefs/Delete.java   |  2 +-
 .../org/apache/tools/ant/taskdefs/Expand.java   |  8 +-
 .../org/apache/tools/ant/taskdefs/Javadoc.java  |  2 +-
 .../org/apache/tools/ant/taskdefs/Replace.java  |  2 +-
 .../org/apache/tools/ant/taskdefs/Rmic.java     |  2 +-
 .../tools/ant/taskdefs/condition/Http.java      |  2 +-
 .../tools/ant/taskdefs/email/EmailTask.java     |  3 +-
 .../tools/ant/taskdefs/email/MimeMailer.java    |  2 +-
 .../tools/ant/taskdefs/optional/ANTLR.java      |  2 +-
 .../tools/ant/taskdefs/optional/NetRexxC.java   |  2 +-
 .../optional/depend/ClassFileIterator.java      |  4 +-
 .../ant/taskdefs/optional/depend/Depend.java    |  6 +-
 .../taskdefs/optional/ejb/IPlanetEjbcTask.java  |  2 +-
 .../optional/ejb/JonasDeploymentTool.java       |  4 +-
 .../optional/extension/ExtensionUtil.java       |  2 +-
 .../ant/taskdefs/optional/i18n/Translate.java   |  4 +-
 .../taskdefs/optional/jdepend/JDependTask.java  |  2 +-
 .../ant/taskdefs/optional/junit/JUnitTask.java  |  2 +-
 .../optional/native2ascii/SunNative2Ascii.java  |  2 +-
 .../apache/tools/ant/types/AbstractFileSet.java |  2 +-
 .../org/apache/tools/ant/types/ZipScanner.java  |  4 +-
 .../ant/types/optional/depend/ClassfileSet.java |  2 +-
 .../types/optional/depend/DependScanner.java    |  4 +-
 .../tools/ant/types/resources/Archives.java     |  2 +-
 .../BaseResourceCollectionContainer.java        |  2 +-
 .../tools/ant/types/resources/FileResource.java |  2 +-
 .../tools/ant/types/resources/ResourceList.java |  2 +-
 .../tools/ant/types/resources/Restrict.java     |  2 +-
 .../DelegatedResourceComparator.java            |  2 +-
 .../types/resources/comparators/FileSystem.java |  2 +-
 .../ant/types/resources/selectors/Name.java     |  2 +-
 .../selectors/AbstractSelectorContainer.java    |  4 +-
 .../tools/ant/types/selectors/TypeSelector.java |  2 +-
 .../tools/ant/util/RegexpPatternMapper.java     |  2 +-
 .../tools/ant/util/SourceFileScanner.java       |  2 +-
 .../resources/LazyResourceCollectionTest.java   | 82 ++++++++++----------
 41 files changed, 94 insertions(+), 95 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 3a9848e..ea037c3 100644
--- a/src/main/org/apache/tools/ant/XmlLogger.java
+++ b/src/main/org/apache/tools/ant/XmlLogger.java
@@ -177,7 +177,7 @@ public class XmlLogger implements BuildLogger {
         }
         String outFilename = getProperty(event, "XmlLogger.file", "log.xml");
         String xslUri = getProperty(event, "ant.XmlLogger.stylesheet.uri", "log.xsl");
-        
+
         try (OutputStream stream =
             outStream == null ? Files.newOutputStream(Paths.get(outFilename)) : outStream;
                 Writer out = new OutputStreamWriter(stream, "UTF8")) {

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
index 9ad2f3d..67694ac 100644
--- a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
+++ b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
@@ -62,13 +62,13 @@ public final class ChainReaderHelper {
         public String readFully() throws IOException {
             return ChainReaderHelper.this.readFully(this);
         }
-        
+
         @Override
         public void close() throws IOException {
             cleanUpClassLoaders(cleanupLoaders);
             super.close();
         }
-        
+
         @Override
         protected void finalize() throws Throwable {
             try {
@@ -236,7 +236,7 @@ public final class ChainReaderHelper {
         final List<Object> finalFilters =
             filterChains.stream().map(FilterChain::getFilterReaders)
                 .flatMap(Collection::stream).collect(Collectors.toList());
-        
+
         if (!finalFilters.isEmpty()) {
             boolean success = false;
             try {

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 b121ade..3b4ed03 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Ant.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java
@@ -422,7 +422,7 @@ public class Ant extends Task {
                         "%s task calling its own parent target.",
                         getTaskName());
                 }
-                
+
                 final Map<String, Target> targetsMap = getProject().getTargets();
 
                 if (locals.stream().map(targetsMap::get)

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
index 8dd7ff1..977921c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
@@ -214,7 +214,7 @@ public class AntStructure extends Task {
                                final Set<String> types) {
             out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
             out.println("<!ENTITY % boolean \"(true|false|on|off|yes|no)\">");
-            
+
             out.println(tasks.stream().collect(
                 Collectors.joining(" | ", "<!ENTITY % tasks \"", "\">")));
 

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/Antlib.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Antlib.java b/src/main/org/apache/tools/ant/taskdefs/Antlib.java
index 24489cd..519436e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Antlib.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Antlib.java
@@ -159,7 +159,7 @@ public class Antlib extends Task implements TaskContainer {
     @Override
     public void execute() {
         //TODO handle tasks added via #addTask()
-        
+
         for (Task task : tasks) {
             UnknownElement ue = (UnknownElement) task;
             setLocation(ue.getLocation());

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 ffdf9a8..7bc3c18 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Delete.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java
@@ -85,7 +85,7 @@ public class Delete extends MatchingTask {
         SymbolicLinkUtils.getSymbolicLinkUtils();
 
     private static class ReverseDirs implements ResourceCollection {
-        
+
         private Project project;
         private File basedir;
         private String[] dirs;

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/Expand.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java
index 62fc196..d6834aa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Expand.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -61,12 +61,12 @@ import org.apache.tools.zip.ZipFile;
  */
 public class Expand extends Task {
     public static final String NATIVE_ENCODING = "native-encoding";
-    
+
     /** Error message when more that one mapper is defined */
     public static final String ERROR_MULTIPLE_MAPPERS = "Cannot define more than one mapper";
-    
+
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-    
+
     private static final int BUFFER_SIZE = 1024;
     private File dest; //req
     private File source; // req
@@ -185,7 +185,7 @@ public class Expand extends Task {
                     getLocation());
         }
         try (
-            ZipFile 
+            ZipFile
             zf = new ZipFile(srcF, encoding, scanForUnicodeExtraFields)){
             boolean empty = true;
             Enumeration<ZipEntry> e = zf.getEntries();

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 62366ad..a92e8da 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1907,7 +1907,7 @@ public class Javadoc extends Task {
             if (doclet.getName() == null) {
                 throw new BuildException("The doclet name must be specified.",
                     getLocation());
-            } 
+            }
             toExecute.createArgument().setValue("-doclet");
             toExecute.createArgument().setValue(doclet.getName());
             if (doclet.getPath() != null) {

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 4213ef8..42fe291 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -626,7 +626,7 @@ public class Replace extends MatchingTask {
         Properties props = new Properties();
 
         try (
-            InputStream 
+            InputStream
             in = propertyResource.getInputStream()){
             props.load(in);
         } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/Rmic.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index c24adfb..e25812f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -91,7 +91,7 @@ public class Rmic extends MatchingTask {
     /** rmic failed message */
     public static final String ERROR_RMIC_FAILED
         = "Rmic failed; see the compiler error output for details.";
-    
+
     /** unable to verify message */
     public static final String ERROR_UNABLE_TO_VERIFY_CLASS = "Unable to verify class ";
     /** could not be found message */

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 a475e07..7f3427f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
@@ -45,7 +45,7 @@ public class Http extends ProjectComponent implements Condition {
     private boolean followRedirects = true;
 
     private int errorsBeginAt = ERROR_BEGINS;
-    
+
     /**
      * Set the url attribute
      * @param url the url of the request

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
index 207a2e3..ec2987e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
@@ -532,8 +532,7 @@ public class EmailTask extends Task {
 
             // identify which files should be attached
             Vector<File> files = new Vector<>();
-            
-            
+
             if (attachments != null) {
                 for (Resource r : attachments) {
                     files.add(r.as(FileProvider.class).getFile());

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
index e80d8d1..b8f0516 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
@@ -283,7 +283,7 @@ public class MimeMailer extends Mailer {
 
     private static InternetAddress[] internetAddresses(final Vector<EmailAddress> list)
         throws AddressException, UnsupportedEncodingException {
-        
+
         final int size = list.size();
         final InternetAddress[] addrs = new InternetAddress[size];
 

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index 2ca2443..3d13f26 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -306,7 +306,7 @@ public class ANTLR extends Task {
             int err = run(commandline.getCommandline());
             if (err != 0) {
                 throw new BuildException("ANTLR returned: " + err, getLocation());
-            } 
+            }
             String output = bos.toString();
             if (output.indexOf("error:") > -1) {
                 throw new BuildException("ANTLR signaled an error: "

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 9c6da4a..070feb4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -786,7 +786,7 @@ public class NetRexxC extends MatchingTask {
         String[] compileArgs =
                 Stream.concat(Stream.of(compileOptionsArray), compileList.stream())
                 .toArray(String[]::new);
-        
+
         // need to set java.class.path property and restore it later
         // since the NetRexx compiler has no option for the classpath
         String currentClassPath = System.getProperty("java.class.path");

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
index 0af7579..48c1f45 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
@@ -32,7 +32,7 @@ public interface ClassFileIterator extends Iterable<ClassFile> {
      * @return the next class file in the iteration
      */
     ClassFile getNextClassFile();
-    
+
     @Override
     default Iterator<ClassFile> iterator() {
 
@@ -58,7 +58,7 @@ public interface ClassFileIterator extends Iterable<ClassFile> {
                     next = getNextClassFile();
                 }
             }
-            
+
         };
     }
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
index c08b089..cb3da26 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
@@ -245,7 +245,7 @@ public class Depend extends MatchingTask {
         Difference diff = new Difference();
         diff.add(destPath);
         diff.add(dependClasspath);
-        
+
         Path p;
         if (diff.isEmpty()) {
             p = null;
@@ -762,10 +762,10 @@ public class Depend extends MatchingTask {
             if (file.getName().endsWith(".class")) {
                 ClassFileInfo info = new ClassFileInfo();
                 info.absoluteFile = file;
-                
+
                 String relativeName = file.getPath().substring(rootLength + 1,
                     file.getPath().length() - ".class".length());
-                
+
                 info.className
                     = ClassFileUtils.convertSlashName(relativeName);
                 info.sourceFile = sourceFileKnownToExist =

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 147e5d5..4d611a2 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
@@ -307,7 +307,7 @@ public class IPlanetEjbcTask extends Task {
     private Path getClasspath() {
         if (classpath == null) {
             return new Path(getProject()).concatSystemClasspath("last");
-        } 
+        }
         return classpath.concatSystemClasspath("ignore");
     }
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 71c0860..04a2dd3 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
@@ -583,13 +583,13 @@ public class JonasDeploymentTool extends GenericDeploymentTool {
         String genicClass; // GenIC class (3 are supported for various
         // versions
         // work around a bug of GenIC 2.5
-        
+
         // class name (search in the classpath provided for the ejbjar element)
         genicClass = getGenicClassName(classpath);
         if (genicClass == null) {
             log("Cannot find GenIC class in classpath.", Project.MSG_ERR);
             throw new BuildException("GenIC class not found, please check the classpath.");
-        } 
+        }
         log("Using '" + genicClass + "' GenIC class." , Project.MSG_VERBOSE);
         genicTask.setClassname(genicClass);
 

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
index 7f951d9..7ed5fb9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
@@ -83,7 +83,7 @@ public final class ExtensionUtil {
                                               final List<FileSet> libraries)
         throws BuildException {
         final List<Extension> extensions = new ArrayList<>();
-        
+
         for (FileSet fileSet : libraries) {
             boolean includeImpl = true;
             boolean includeURL = true;

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
index 42e2be1..3ec7d77 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
@@ -364,14 +364,14 @@ public class Translate extends MatchingTask {
         Locale locale = new Locale(bundleLanguage,
                                    bundleCountry,
                                    bundleVariant);
-        
+
         String language = locale.getLanguage().length() > 0
             ? "_" + locale.getLanguage() : "";
         String country = locale.getCountry().length() > 0
             ? "_" + locale.getCountry() : "";
         String variant = locale.getVariant().length() > 0
             ? "_" + locale.getVariant() : "";
-        
+
         processBundle(bundle + language + country + variant, BUNDLE_SPECIFIED_LANGUAGE_COUNTRY_VARIANT,
false);
         processBundle(bundle + language + country, BUNDLE_SPECIFIED_LANGUAGE_COUNTRY, false);
         processBundle(bundle + language, BUNDLE_SPECIFIED_LANGUAGE, false);

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 abc52e3..331c975 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
@@ -584,7 +584,7 @@ public class JDependTask extends Task {
         getWorkingPath().ifPresent(path -> {
             for (String filepath : path.list()) {
                 File f = new File(filepath);
-                
+
                 // not necessary as JDepend would fail, but why loose
                 // some time?
                 if (!f.exists() || !f.isDirectory()) {

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/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 e32403c..d37337a 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
@@ -1672,7 +1672,7 @@ public class JUnitTask extends Task {
         final int count = batchTests.size();
         @SuppressWarnings("unchecked")
         final Enumeration<JUnitTest>[] enums = new Enumeration[ count + 1];
-        
+
         for (int i = 0; i < count; i++) {
             final BatchTest batchtest = batchTests.get(i);
             enums[i] = batchtest.elements();

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java
b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java
index fdcce7d..268006e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java
@@ -37,7 +37,7 @@ public final class SunNative2Ascii extends DefaultNative2Ascii {
     public static final String IMPLEMENTATION_NAME = "sun";
 
     private static final String SUN_TOOLS_NATIVE2ASCII_MAIN = "sun.tools.native2ascii.Main";
-    
+
     /** {@inheritDoc} */
     @Override
     protected void setup(Commandline cmd, Native2Ascii args)

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/AbstractFileSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 58e7c16..bcfc5a0 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -949,7 +949,7 @@ public abstract class AbstractFileSet extends DataType
         if (isReference()) {
             super.dieOnCircularReference(stk, p);
         } else {
-            selectors.stream().filter(DataType.class::isInstance).forEach(fileSelector ->

+            selectors.stream().filter(DataType.class::isInstance).forEach(fileSelector ->
                 pushAndInvokeCircularReferenceCheck((DataType) fileSelector, stk, p)
             );
             for (PatternSet ps : additionalPatterns) {

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/ZipScanner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java
index 49f66eb..a3df040 100644
--- a/src/main/org/apache/tools/ant/types/ZipScanner.java
+++ b/src/main/org/apache/tools/ant/types/ZipScanner.java
@@ -60,7 +60,7 @@ public class ZipScanner extends ArchiveScanner {
         File srcFile = src.asOptional(FileProvider.class)
             .map(FileProvider::getFile).orElseThrow(() -> new BuildException(
                 "Only file provider resources are supported"));
-        
+
         try (ZipFile zf = new ZipFile(srcFile, encoding)) {
 
             Enumeration<ZipEntry> e = zf.getEntries();
@@ -87,4 +87,4 @@ public class ZipScanner extends ArchiveScanner {
             throw new BuildException("Problem opening " + srcFile, ex);
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
index f966646..7f9ff2d 100644
--- a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
+++ b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
@@ -89,7 +89,7 @@ public class ClassfileSet extends FileSet {
         super(s);
         rootClasses.addAll(s.rootClasses);
     }
-    
+
     /**
      * Add a fileset to which contains a collection of root classes used to
      * drive the search from classes.

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
index 5ea51c7..f21b855 100644
--- a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
+++ b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
@@ -125,9 +125,9 @@ public class DependScanner extends DirectoryScanner {
 
         Set<String> parentSet = Stream.of(parentScanner.getIncludedFiles())
             .collect(Collectors.toSet());
-        
+
         Enumeration<String> e = analyzer.getClassDependencies();
-        
+
         while (e.hasMoreElements()) {
             String classname = e.nextElement();
             String filename =

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/resources/Archives.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/Archives.java b/src/main/org/apache/tools/ant/types/resources/Archives.java
index f47676f..f616eb7 100644
--- a/src/main/org/apache/tools/ant/types/resources/Archives.java
+++ b/src/main/org/apache/tools/ant/types/resources/Archives.java
@@ -190,7 +190,7 @@ public class Archives extends DataType
             setChecked(true);
         }
     }
-    
+
     @Override
     protected Archives getCheckedRef() {
         return (Archives) super.getCheckedRef();

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
index e394ba9..b335334 100644
--- a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
+++ b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
@@ -247,7 +247,7 @@ public abstract class BaseResourceCollectionContainer
         return coll.stream().map(Object::toString)
             .collect(Collectors.joining(File.pathSeparator));
     }
-    
+
     @Override
     protected BaseResourceCollectionContainer getCheckedRef() {
         return (BaseResourceCollectionContainer) super.getCheckedRef();

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/resources/FileResource.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/FileResource.java b/src/main/org/apache/tools/ant/types/resources/FileResource.java
index a1c410a..5a8ba90 100644
--- a/src/main/org/apache/tools/ant/types/resources/FileResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/FileResource.java
@@ -406,7 +406,7 @@ public class FileResource extends Resource implements Touchable, FileProvider,
         }
         return fileResource;
     }
-    
+
     @Override
     protected FileResource getCheckedRef() {
         return (FileResource) super.getCheckedRef();

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/resources/ResourceList.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/ResourceList.java b/src/main/org/apache/tools/ant/types/resources/ResourceList.java
index 204db1d..ed8f5ec 100644
--- a/src/main/org/apache/tools/ant/types/resources/ResourceList.java
+++ b/src/main/org/apache/tools/ant/types/resources/ResourceList.java
@@ -232,5 +232,5 @@ public class ResourceList extends DataType implements ResourceCollection
{
         }
         return new FileResource(getProject(), expandedLine);
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/resources/Restrict.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/Restrict.java b/src/main/org/apache/tools/ant/types/resources/Restrict.java
index cc9cc26..04256f0 100644
--- a/src/main/org/apache/tools/ant/types/resources/Restrict.java
+++ b/src/main/org/apache/tools/ant/types/resources/Restrict.java
@@ -155,7 +155,7 @@ public class Restrict
             setChecked(true);
         }
     }
-    
+
     @Override
     protected Restrict getCheckedRef() {
         return (Restrict) super.getCheckedRef();

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java
b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java
index dbe13d4..28f6793 100644
--- a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java
+++ b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java
@@ -118,7 +118,7 @@ s.
             setChecked(true);
         }
     }
-    
+
     private static Comparator<Resource> composite(List<? extends Comparator<Resource>>
foo) {
         Comparator<Resource> result = null;
         if (foo != null) {

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java b/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java
index 1d6d3c3..3ae7938 100644
--- a/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java
+++ b/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java
@@ -45,7 +45,7 @@ public class FileSystem extends ResourceComparator {
     protected int resourceCompare(Resource foo, Resource bar) {
         return compare(file(foo), file(bar));
     }
-    
+
     private File file(Resource r) {
         return r.asOptional(FileProvider.class)
             .orElseThrow(() -> new ClassCastException(

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
index f5adeb4..fcbe51e 100644
--- a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
+++ b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
@@ -132,7 +132,7 @@ public class Name implements ResourceSelector {
     private boolean matches(String name) {
         if (pattern != null) {
             return SelectorUtils.match(modify(pattern), modify(name), cs);
-        } 
+        }
         if (reg == null) {
             reg = new RegularExpression();
             reg.setPattern(regex);

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
index 61f02b6..90a2a87 100644
--- a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
@@ -359,10 +359,10 @@ public abstract class AbstractSelectorContainer extends DataType
             throw new BuildException(e);
         }
     }
-    
+
     @Override
     protected AbstractSelectorContainer getCheckedRef() {
         return (AbstractSelectorContainer) super.getCheckedRef();
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java b/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java
index ef6853f..5d09c17 100644
--- a/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java
@@ -32,7 +32,7 @@ public class TypeSelector extends BaseExtendSelector {
 
     /** Key to used for parameterized custom selector */
     public static final String TYPE_KEY = "type";
-    
+
     private String type = null;
 
     /**

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
index 5974847..e32a987 100644
--- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
@@ -81,7 +81,7 @@ public class RegexpPatternMapper implements FileNameMapper {
     public void setFrom(String from) throws BuildException {
         if (from == null) {
             throw new BuildException("this mapper requires a 'from' attribute");
-        } 
+        }
         try {
             reg.setPattern(from);
         } catch (NoClassDefFoundError e) {

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/main/org/apache/tools/ant/util/SourceFileScanner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/SourceFileScanner.java b/src/main/org/apache/tools/ant/util/SourceFileScanner.java
index 879da84..7d76eaf 100644
--- a/src/main/org/apache/tools/ant/util/SourceFileScanner.java
+++ b/src/main/org/apache/tools/ant/util/SourceFileScanner.java
@@ -97,7 +97,7 @@ public class SourceFileScanner implements ResourceFactory {
                 public String getName() {
                     return f;
                 }
-            }).toArray(Resource[]::new);        
+            }).toArray(Resource[]::new);
 
         // build the list of sources which are out of date with
         // respect to the target

http://git-wip-us.apache.org/repos/asf/ant/blob/ee47fa6e/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java
b/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java
index 34bcecd..4f9d565 100644
--- a/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java
@@ -34,36 +34,36 @@ import static org.junit.Assert.fail;
 public class LazyResourceCollectionTest {
 
     private class StringResourceCollection implements ResourceCollection {
-        List<StringResourceIterator> createdIterators = new ArrayList<>();
+        List<StringResourceIterator> createdIterators = new ArrayList<>();
 
-        @Override
+        @Override
         public int size() {
-            return 3;
+            return 3;
         }
 
-        @Override
+        @Override
         public Iterator<Resource> iterator() {
             StringResourceIterator it = new StringResourceIterator();
             createdIterators.add(it);
             return it;
         }
 
-        @Override
+        @Override
         public boolean isFilesystemOnly() {
             return false;
         }
     }
 
-    private class StringResourceIterator implements Iterator<Resource> {
+    private class StringResourceIterator implements Iterator<Resource> {
         int cursor = 0;
 
-        @Override
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
 
-        @Override
-        public StringResource next() {
+        @Override
+        public StringResource next() {
             if (cursor < 3) {
                 cursor++;
                 return new StringResource("r" + cursor);
@@ -71,7 +71,7 @@ public class LazyResourceCollectionTest {
             return null;
         }
 
-        @Override
+        @Override
         public boolean hasNext() {
             return cursor < 3;
         }
@@ -85,25 +85,25 @@ public class LazyResourceCollectionTest {
 
         Iterator<Resource> it = lazyCollection.iterator();
         assertOneCreatedIterator(collectionTest);
-        StringResourceIterator stringResourceIterator =
-            collectionTest.createdIterators.get(0);
+        StringResourceIterator stringResourceIterator =
+            collectionTest.createdIterators.get(0);
         assertEquals("A resource was loaded without iterating", 1,
-            stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        assertStringValue("r1", it.next());
+        assertStringValue("r1", it.next());
         assertOneCreatedIterator(collectionTest);
         assertEquals("Iterating once load more than 1 resource", 2,
-            stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        assertStringValue("r2", it.next());
+        assertStringValue("r2", it.next());
         assertOneCreatedIterator(collectionTest);
         assertEquals("Iterating twice load more than 2 resources", 3,
-            stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        assertStringValue("r3", it.next());
+        assertStringValue("r3", it.next());
         assertOneCreatedIterator(collectionTest);
         assertEquals("Iterating 3 times load more than 3 resources", 3,
-            stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
         try {
             it.next();
@@ -131,37 +131,37 @@ public class LazyResourceCollectionTest {
         Iterator<Resource> it2 = lazyCollection.iterator();
         assertOneCreatedIterator(collectionTest);
 
-        StringResourceIterator stringResourceIterator =
-            collectionTest.createdIterators.get(0);
+        StringResourceIterator stringResourceIterator =
+            collectionTest.createdIterators.get(0);
         assertEquals("A resource was loaded without iterating", 1,
-            stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        assertStringValue("r1", it1.next());
+        assertStringValue("r1", it1.next());
         assertEquals("Iterating once load more than 1 resource", 2,
-            stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        assertStringValue("r1", it2.next());
+        assertStringValue("r1", it2.next());
         assertEquals(
-            "The second iterator did not lookup in the cache for a resource", 2,
-            stringResourceIterator.cursor);
+            "The second iterator did not lookup in the cache for a resource", 2,
+            stringResourceIterator.cursor);
 
-        assertStringValue("r2", it2.next());
+        assertStringValue("r2", it2.next());
         assertEquals("Iterating twice load more than 2 resources", 3,
-            stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        assertStringValue("r2", it1.next());
+        assertStringValue("r2", it1.next());
         assertEquals(
-            "The first iterator did not lookup in the cache for a resource", 3,
-            stringResourceIterator.cursor);
+            "The first iterator did not lookup in the cache for a resource", 3,
+            stringResourceIterator.cursor);
 
-        assertStringValue("r3", it2.next());
+        assertStringValue("r3", it2.next());
         assertEquals("Iterating 3 times load more than 3 resources", 3,
-            stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        assertStringValue("r3", it1.next());
+        assertStringValue("r3", it1.next());
         assertEquals(
-            "The first iterator did not lookup in the cache for a resource", 3,
-            stringResourceIterator.cursor);
+            "The first iterator did not lookup in the cache for a resource", 3,
+            stringResourceIterator.cursor);
 
         try {
             it1.next();
@@ -177,8 +177,8 @@ public class LazyResourceCollectionTest {
             // ok
         }
     }
-
-    private void assertStringValue(String expected, Resource r) {
-        assertEquals(expected, r.as(StringResource.class).getValue());
-    }
+
+    private void assertStringValue(String expected, Resource r) {
+        assertEquals(expected, r.as(StringResource.class).getValue());
+    }
 }


Mime
View raw message