Avoid repetition

src/main/org/apache/tools/ant/filters/TokenFilter.java

@@ -110,8 +110,7 @@ public class TokenFilter extends BaseFilterReader
             if (line == null) {
                 return -1;
             }
-            for (Enumeration<Filter> e = filters.elements(); e.hasMoreElements();) {
-                Filter filter = e.nextElement();
+            for (Filter filter : filters) {
                 line = filter.filter(line);
                 if (line == null) {
                     break;

src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java

@@ -78,7 +78,7 @@ public class CommonsLoggingListener implements BuildListener, BuildLogger {
         if (suffix != null) {
             suffix = suffix.replace('.', '-');
             suffix = suffix.replace(' ', '-');
-            cat = cat + "." + suffix;
+            cat += "." + suffix;
         }
         final PrintStream tmpOut = System.out;
         final PrintStream tmpErr = System.err;

src/main/org/apache/tools/ant/taskdefs/Checksum.java

@@ -611,7 +611,7 @@ public class Checksum extends MatchingTask implements Condition {
         // two characters form the hex value.
         for (int i = 0, j = 0; j < l; i++) {
             int f = Character.digit(data[j++], WORD) << NIBBLE;
-            f = f | Character.digit(data[j++], WORD);
+            f |= Character.digit(data[j++], WORD);
             out[i] = (byte) (f & BYTE_MASK);
         }
 

src/main/org/apache/tools/ant/taskdefs/Copy.java

@@ -505,14 +505,12 @@ public class Copy extends Task {
                     }
                     final File fromDir = fs.getDir(getProject());
 
-                    final String[] srcFiles = ds.getIncludedFiles();
-                    final String[] srcDirs = ds.getIncludedDirectories();
                     if (!flatten && mapperElement == null
                         && ds.isEverythingIncluded() && !fs.hasPatterns()) {
                         completeDirMap.put(fromDir, destDir);
                     }
-                    add(fromDir, srcFiles, filesByBasedir);
-                    add(fromDir, srcDirs, dirsByBasedir);
+                    add(fromDir, ds.getIncludedFiles(), filesByBasedir);
+                    add(fromDir, ds.getIncludedDirectories(), dirsByBasedir);
                     baseDirs.add(fromDir);
                 } else { // not a fileset or contains non-file resources
 

src/main/org/apache/tools/ant/taskdefs/Copydir.java

@@ -121,8 +121,7 @@ public class Copydir extends MatchingTask {
         DirectoryScanner ds = super.getDirectoryScanner(srcDir);
 
         try {
-            String[] files = ds.getIncludedFiles();
-            scanDir(srcDir, destDir, files);
+            scanDir(srcDir, destDir, ds.getIncludedFiles());
             if (filecopyList.size() > 0) {
                 log("Copying " + filecopyList.size() + " file"
                     + (filecopyList.size() == 1 ? "" : "s")

src/main/org/apache/tools/ant/taskdefs/Definer.java

@@ -296,7 +296,7 @@ public abstract class Definer extends DefBase {
             resource = path.substring("//".length());
             if (!resource.endsWith(".xml")) {
                 //if we haven't already named an XML file, it gets antlib.xml
-                resource = resource + ANTLIB_XML;
+                resource += ANTLIB_XML;
             }
         } else {
             //convert from a package to a path

src/main/org/apache/tools/ant/taskdefs/Javac.java

@@ -1186,9 +1186,8 @@ public class Javac extends MatchingTask {
             }
 
             final DirectoryScanner ds = this.getDirectoryScanner(srcDir);
-            final String[] files = ds.getIncludedFiles();
 
-            scanDir(srcDir, destDir != null ? destDir : srcDir, files);
+            scanDir(srcDir, destDir != null ? destDir : srcDir, ds.getIncludedFiles());
         }
     }
 

src/main/org/apache/tools/ant/taskdefs/LoadProperties.java

@@ -185,7 +185,7 @@ public class LoadProperties extends Task {
 
             if (text != null && !text.isEmpty()) {
                 if (!text.endsWith("\n")) {
-                    text = text + "\n";
+                    text += "\n";
                 }
                 ByteArrayInputStream tis = new ByteArrayInputStream(
                     text.getBytes(ResourceUtils.ISO_8859_1));

src/main/org/apache/tools/ant/taskdefs/MakeUrl.java

@@ -241,7 +241,7 @@ public class MakeUrl extends Task {
             url = toURL(file);
             //and add any files if also defined
             if (!filesetURL.isEmpty()) {
-                url = url + separator + filesetURL;
+                url += separator + filesetURL;
             }
         }
         //add path URLs
@@ -250,7 +250,7 @@ public class MakeUrl extends Task {
             if (url.isEmpty()) {
                 url = pathURL;
             } else {
-                url = url + separator + pathURL;
+                url += separator + pathURL;
             }
         }
         log("Setting " + property + " to URL " + url, Project.MSG_VERBOSE);

src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java

@@ -113,7 +113,7 @@ public class ManifestClassPath extends Task {
             }
 
             if (pathEntry.isDirectory() && !relPath.endsWith("/")) {
-                relPath = relPath + '/';
+                relPath += '/';
             }
             relPath = Locator.encodeURI(relPath);
 

src/main/org/apache/tools/ant/taskdefs/Move.java

@@ -125,9 +125,7 @@ public class Move extends Copy {
                     fs.setDir(fromDir);
                     addFileset(fs);
                     DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-                    String[] files = ds.getIncludedFiles();
-                    String[] dirs = ds.getIncludedDirectories();
-                    scan(fromDir, toDir, files, dirs);
+                    scan(fromDir, toDir, ds.getIncludedFiles(), ds.getIncludedDirectories());
                 }
             }
         }

src/main/org/apache/tools/ant/taskdefs/Rmic.java

@@ -628,8 +628,7 @@ public class Rmic extends MatchingTask {
             // specific classname is not given
             if (classname == null) {
                 DirectoryScanner ds = this.getDirectoryScanner(baseDir);
-                String[] files = ds.getIncludedFiles();
-                scanDir(baseDir, files, adapter.getMapper());
+                scanDir(baseDir, ds.getIncludedFiles(), adapter.getMapper());
             } else {
                 // otherwise perform a timestamp comparison - at least
                 String path = classname.replace('.', File.separatorChar)

src/main/org/apache/tools/ant/taskdefs/Tar.java

@@ -409,8 +409,8 @@ public class Tar extends MatchingTask {
 
                 String prefix = tarFileSet.getPrefix(this.getProject());
                 // '/' is appended for compatibility with the zip task.
-                if (prefix.length() > 0 && !prefix.endsWith("/")) {
-                    prefix = prefix + "/";
+                if (!prefix.isEmpty() && !prefix.endsWith("/")) {
+                    prefix += "/";
                 }
                 vPath = prefix + vPath;
             }

src/main/org/apache/tools/ant/taskdefs/Zip.java

@@ -1026,7 +1026,7 @@ public class Zip extends MatchingTask {
         throws IOException {
 
         if (!name.endsWith("/")) {
-            name = name + "/";
+            name += "/";
         }
 
         final int nextToLastSlash = name.lastIndexOf('/', name.length() - 2);

src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java

@@ -101,11 +101,11 @@ public class CvsVersion extends AbstractCvsTask {
                 }
             }
             String s2 = s.substring(0, i);
-            version = version + counter * Long.parseLong(s2);
+            version += counter * Long.parseLong(s2);
             if (counter == 1) {
                 break;
             }
-            counter = counter / MULTIPLY;
+            counter /= MULTIPLY;
         }
         return version >= VERSION_1_11_2;
     }

src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java

@@ -664,9 +664,7 @@ public class NetRexxC extends MatchingTask {
         // compile lists
         DirectoryScanner ds = getDirectoryScanner(srcDir);
 
-        String[] files = ds.getIncludedFiles();
-
-        scanDir(srcDir, destDir, files);
+        scanDir(srcDir, destDir, ds.getIncludedFiles());
 
         // copy the source and support files
         copyFilesToDestination();

src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java

@@ -151,7 +151,7 @@ public class BorlandGenerateClient extends Task {
             String ejbjarname = ejbjarfile.getAbsolutePath();
             //clientname = ejbjarfile+client.jar
             String clientname = ejbjarname.substring(0, ejbjarname.lastIndexOf("."));
-            clientname = clientname + "client.jar";
+            clientname += "client.jar";
             clientjarfile = new File(clientname);
         }
 

src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java

@@ -451,7 +451,7 @@ public class Translate extends MatchingTask {
                             value = value.substring(0, value.length() - 1);
                             line = in.readLine();
                             if (line != null) {
-                                value = value + line.trim();
+                                value += line.trim();
                             } else {
                                 break;
                             }

src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java

@@ -133,7 +133,6 @@ public class WLJspc extends MatchingTask {
         }
 
         compileClasspath = compileClasspath.concatSystemClasspath();
-        String[] files = ds.getIncludedFiles();
 
         //Weblogic.jspc calls System.exit() ... have to fork
         // Therefore, takes loads of time
@@ -164,7 +163,7 @@ public class WLJspc extends MatchingTask {
         args[j++] = "-classpath";
         args[j++] = compileClasspath.toString();
 
-        this.scanDir(files);
+        this.scanDir(ds.getIncludedFiles());
         log("Compiling " + filesToDo.size() + " JSP files");
 
         for (String filename : filesToDo) {

src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java

@@ -471,13 +471,10 @@ public class FTP extends Task implements FTPTaskConfig {
                         && currentelement.length() > 0) {
                         accountForIncludedDir(currentelement, myfile, true);
                     }  else {
-                        if (currentelement.length() > 0) {
-                            if (currentelement.charAt(currentelement
-                                                      .length() - 1)
+                        if (currentelement.length() > 0
+                                && currentelement.charAt(currentelement.length() - 1)
                                 != File.separatorChar) {
-                                currentelement =
-                                    currentelement + File.separatorChar;
-                            }
+                            currentelement += File.separatorChar;
                         }
                         scandir(myfile.getAbsolutePath(), currentelement, true);
                     }
@@ -974,20 +971,20 @@ public class FTP extends Task implements FTPTaskConfig {
                     if (theFiles != null) {
                         theFile = getFile(theFiles, currentElement);
                     }
-                    if (!"".equals(relPath)) {
-                        relPath = relPath + remoteFileSep;
+                    if (relPath != null && !relPath.isEmpty()) {
+                        relPath += remoteFileSep;
                     }
                     if (theFile == null) {
                         // hit a hidden file assume not a symlink
-                        relPath = relPath + currentElement;
-                        currentPath = currentPath + remoteFileSep + currentElement;
+                        relPath += currentElement;
+                        currentPath += remoteFileSep + currentElement;
                         log("Hidden file " + relPath
                             + " assumed to not be a symlink.",
                             Project.MSG_VERBOSE);
                     } else {
                         traversesSymlinks = traversesSymlinks || theFile.isSymbolicLink();
-                        relPath = relPath + theFile.getName();
-                        currentPath = currentPath + remoteFileSep + theFile.getName();
+                        relPath += theFile.getName();
+                        currentPath += remoteFileSep + theFile.getName();
                     }
                 }
                 return relPath;

src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java

@@ -363,13 +363,10 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
                         && currentelement.length() > 0) {
                         accountForIncludedDir(currentelement, myfile, true);
                     }  else {
-                        if (currentelement.length() > 0) {
-                            if (currentelement.charAt(currentelement
-                                                      .length() - 1)
+                        if (currentelement.length() > 0
+                                && currentelement.charAt(currentelement.length() - 1)
                                 != File.separatorChar) {
-                                currentelement =
-                                    currentelement + File.separatorChar;
-                            }
+                            currentelement += File.separatorChar;
                         }
                         scandir(myfile.getAbsolutePath(), currentelement, true);
                     }
@@ -875,22 +872,20 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
                     if (theFiles != null) {
                         theFile = getFile(theFiles, currentElement);
                     }
-                    if (!"".equals(relPath)) {
-                        relPath = relPath + task.getSeparator();
+                    if (relPath != null && !relPath.isEmpty()) {
+                        relPath += task.getSeparator();
                     }
                     if (theFile == null) {
                         // hit a hidden file assume not a symlink
-                        relPath = relPath + currentElement;
-                        currentPath = currentPath + task.getSeparator()
-                            + currentElement;
+                        relPath += currentElement;
+                        currentPath += task.getSeparator() + currentElement;
                         task.log("Hidden file " + relPath
                                  + " assumed to not be a symlink.",
                                  Project.MSG_VERBOSE);
                     } else {
                         traversesSymlinks = traversesSymlinks || theFile.isSymbolicLink();
-                        relPath = relPath + theFile.getName();
-                        currentPath = currentPath + task.getSeparator()
-                            + theFile.getName();
+                        relPath += theFile.getName();
+                        currentPath += task.getSeparator() + theFile.getName();
                     }
                 }
                 return relPath;

src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java

@@ -113,7 +113,7 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
             try {
                 final SftpATTRS attrs = channel.stat(remoteFile);
                 if (attrs.isDir() && !remoteFile.endsWith("/")) {
-                    remoteFile = remoteFile + "/";
+                    remoteFile += "/";
                 }
             } catch (final SftpException ee) {
                 // Ignored

src/main/org/apache/tools/ant/types/optional/image/Scale.java

@@ -95,8 +95,7 @@ public class Scale extends TransformOperation implements DrawOperation {
         int percIndex = heightStr.indexOf('%');
         if (percIndex > 0) {
             yPercent = true;
-            float height = Float.parseFloat(heightStr.substring(0, percIndex));
-            return height / HUNDRED;
+            return Float.parseFloat(heightStr.substring(0, percIndex)) / HUNDRED;
         }
         yPercent = false;
         return Float.parseFloat(heightStr);
@@ -114,10 +113,10 @@ public class Scale extends TransformOperation implements DrawOperation {
         float yFl = getHeight();
 
         if (!xPercent) {
-            xFl = xFl / image.getWidth();
+            xFl /= image.getWidth();
         }
         if (!yPercent) {
-            yFl = yFl / image.getHeight();
+            yFl /= image.getHeight();
         }
 
         if ("width".equals(proportions)) {

src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java

@@ -58,7 +58,7 @@ public class ScriptFixBSFPath {
     /** A map of languages for which the engine in located in bsf */
     private static final Map<String, String> BSF_LANGUAGE_MAP = new HashMap<>();
     static {
-        for (int i = 0; i < BSF_LANGUAGES.length; i = i + 2) {
+        for (int i = 0; i < BSF_LANGUAGES.length; i += 2) {
             BSF_LANGUAGE_MAP.put(BSF_LANGUAGES[i], BSF_LANGUAGES[i + 1]);
         }
     }

src/main/org/apache/tools/ant/util/ScriptRunnerBase.java

@@ -92,15 +92,17 @@ public abstract class ScriptRunnerBase {
      * @param bean the object to be stored in the script context.
      */
     public void addBean(String key, Object bean) {
-        boolean isValid = key.length() > 0
-            && Character.isJavaIdentifierStart(key.charAt(0));
-
-        for (int i = 1; isValid && i < key.length(); i++) {
-            isValid = Character.isJavaIdentifierPart(key.charAt(i));
+        if (key.isEmpty()) {
+            return;
         }
-        if (isValid) {
-            beans.put(key, bean);
+
+        for (char ch : key.toCharArray()) {
+            if (!Character.isJavaIdentifierPart(ch)) {
+                return;
+            }
         }
+
+        beans.put(key, bean);
     }
 
     /**

src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java

@@ -96,13 +96,13 @@ public class RegexpUtil {
                                 boolean singleLine) {
         int options = RegexpMatcher.MATCH_DEFAULT;
         if (!caseSensitive) {
-            options = options | RegexpMatcher.MATCH_CASE_INSENSITIVE;
+            options |= RegexpMatcher.MATCH_CASE_INSENSITIVE;
         }
         if (multiLine) {
-            options = options | RegexpMatcher.MATCH_MULTILINE;
+            options |= RegexpMatcher.MATCH_MULTILINE;
         }
         if (singleLine) {
-            options = options | RegexpMatcher.MATCH_SINGLELINE;
+            options |= RegexpMatcher.MATCH_SINGLELINE;
         }
         return options;
     }

src/main/org/apache/tools/tar/TarEntry.java

@@ -993,7 +993,7 @@ public class TarEntry implements TarConstants {
                 // SunOS tar -E does not add / to directory names, so fix
                 // up to be consistent
                 if (isDirectory() && !name.endsWith("/")) {
-                    name = name + "/";
+                    name += "/";
                 }
                 if (prefix.length() > 0) {
                     name = prefix + "/" + name;

src/tutorial/tasks-filesets-properties/02-fileset/src/Find.java

@@ -53,12 +53,11 @@ public class Find extends Task {
         String foundLocation = null;
         for (FileSet fs : filesets) {
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-            String[] includedFiles = ds.getIncludedFiles();
-            for (String includedFile : includedFiles) {
+            File base  = ds.getBasedir();
+            for (String includedFile : ds.getIncludedFiles()) {
                 String filename = includedFile.replace('\\','/');
                 filename = filename.substring(filename.lastIndexOf("/") + 1);
                 if (foundLocation == null && file.equals(filename)) {
-                    File base  = ds.getBasedir();
                     File found = new File(base, includedFile);
                     foundLocation = found.getAbsolutePath();
                 }