diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java index abe5f3482..ffadc3991 100644 --- a/src/main/org/apache/tools/ant/ComponentHelper.java +++ b/src/main/org/apache/tools/ant/ComponentHelper.java @@ -746,9 +746,9 @@ public class ComponentHelper { } props.load(in); - Enumeration enum = props.propertyNames(); - while (enum.hasMoreElements()) { - String name = (String) enum.nextElement(); + Enumeration e = props.propertyNames(); + while (e.hasMoreElements()) { + String name = (String) e.nextElement(); String className = props.getProperty(name); AntTypeDefinition def = new AntTypeDefinition(); def.setName(name); @@ -791,9 +791,9 @@ public class ComponentHelper { } props.load(in); - Enumeration enum = props.propertyNames(); - while (enum.hasMoreElements()) { - String name = (String) enum.nextElement(); + Enumeration e = props.propertyNames(); + while (e.hasMoreElements()) { + String name = (String) e.nextElement(); String className = props.getProperty(name); AntTypeDefinition def = new AntTypeDefinition(); def.setName(name); diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java index 20e2e8528..29c1399c2 100644 --- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java +++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java @@ -419,10 +419,10 @@ public class RuntimeConfigurable implements Serializable { ProjectHelper.addText(p, wrappedObject, characters.substring(0)); } - Enumeration enum = getChildren(); - while (enum.hasMoreElements()) { + Enumeration e = getChildren(); + while (e.hasMoreElements()) { RuntimeConfigurable child - = (RuntimeConfigurable) enum.nextElement(); + = (RuntimeConfigurable) e.nextElement(); if (child.wrappedObject instanceof Task) { Task childTask = (Task) child.wrappedObject; childTask.setRuntimeConfigurableWrapper(child); diff --git a/src/main/org/apache/tools/ant/Task.java b/src/main/org/apache/tools/ant/Task.java index 8f38290ca..6dc2d6808 100644 --- a/src/main/org/apache/tools/ant/Task.java +++ b/src/main/org/apache/tools/ant/Task.java @@ -474,10 +474,10 @@ public abstract class Task extends ProjectComponent { */ private void replaceChildren(RuntimeConfigurable wrapper, UnknownElement parentElement) { - Enumeration enum = wrapper.getChildren(); - while (enum.hasMoreElements()) { + Enumeration e = wrapper.getChildren(); + while (e.hasMoreElements()) { RuntimeConfigurable childWrapper = - (RuntimeConfigurable) enum.nextElement(); + (RuntimeConfigurable) e.nextElement(); UnknownElement childElement = new UnknownElement(childWrapper.getElementTag()); parentElement.addChild(childElement); diff --git a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java index b9791ce7c..3958daa77 100644 --- a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java +++ b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java @@ -124,14 +124,14 @@ public class DefaultInputHandler implements InputHandler { if (request instanceof MultipleChoiceInputRequest) { StringBuffer sb = new StringBuffer(prompt); sb.append("("); - Enumeration enum = + Enumeration e = ((MultipleChoiceInputRequest) request).getChoices().elements(); boolean first = true; - while (enum.hasMoreElements()) { + while (e.hasMoreElements()) { if (!first) { sb.append(","); } - sb.append(enum.nextElement()); + sb.append(e.nextElement()); first = false; } sb.append(")"); diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java index b9f0f0074..1e7c77e86 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ant.java +++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java @@ -384,16 +384,16 @@ public class Ant extends Task { } finally { // help the gc newProject = null; - Enumeration enum = properties.elements(); - while (enum.hasMoreElements()) { - Property p = (Property) enum.nextElement(); + Enumeration e = properties.elements(); + while (e.hasMoreElements()) { + Property p = (Property) e.nextElement(); p.setProject(null); } if (output != null && out != null) { try { out.close(); - } catch (final Exception e) { + } catch (final Exception ex) { //ignore } } diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index 4bfca28d4..987cbcb7c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -272,9 +272,9 @@ public class AntStructure extends Task { v.addElement(TASKS); } - Enumeration enum = ih.getNestedElements(); - while (enum.hasMoreElements()) { - v.addElement(enum.nextElement()); + Enumeration e = ih.getNestedElements(); + while (e.hasMoreElements()) { + v.addElement(e.nextElement()); } if (v.isEmpty()) { @@ -300,9 +300,9 @@ public class AntStructure extends Task { sb.append(name); sb.append(lSep).append(" id ID #IMPLIED"); - enum = ih.getAttributes(); - while (enum.hasMoreElements()) { - String attrName = (String) enum.nextElement(); + e = ih.getAttributes(); + while (e.hasMoreElements()) { + String attrName = (String) e.nextElement(); if ("id".equals(attrName)) { continue; } diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index ca52c47f3..bb2dea4ac 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java @@ -304,12 +304,12 @@ public class Concat extends Task { * Specify the end of line to find and to add if * not present at end of each input file. This attribute * is used in conjuction with fixlastline. - * @param enum the type of new line to add - + * @param crlf the type of new line to add - * cr, mac, lf, unix, crlf, or dos * @since Ant 1.6 */ - public void setEol(FixCRLF.CrLf enum) { - String s = enum.getValue(); + public void setEol(FixCRLF.CrLf crlf) { + String s = crlf.getValue(); if (s.equals("cr") || s.equals("mac")) { eolString = "\r"; } else if (s.equals("lf") || s.equals("unix")) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Copydir.java b/src/main/org/apache/tools/ant/taskdefs/Copydir.java index 5b88d2212..c24302e9a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copydir.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copydir.java @@ -142,9 +142,9 @@ public class Copydir extends MatchingTask { log("Copying " + filecopyList.size() + " file" + (filecopyList.size() == 1 ? "" : "s") + " to " + destDir.getAbsolutePath()); - Enumeration enum = filecopyList.keys(); - while (enum.hasMoreElements()) { - String fromFile = (String) enum.nextElement(); + Enumeration e = filecopyList.keys(); + while (e.hasMoreElements()) { + String fromFile = (String) e.nextElement(); String toFile = (String) filecopyList.get(fromFile); try { getProject().copyFile(fromFile, toFile, filtering, diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index 40e90af10..ef89b764b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -156,9 +156,9 @@ public class Expand extends Task { ZipFile zf = null; try { zf = new ZipFile(srcF, encoding); - Enumeration enum = zf.getEntries(); - while (enum.hasMoreElements()) { - ZipEntry ze = (ZipEntry) enum.nextElement(); + Enumeration e = zf.getEntries(); + while (e.hasMoreElements()) { + ZipEntry ze = (ZipEntry) e.nextElement(); extractFile(fileUtils, srcF, dir, zf.getInputStream(ze), ze.getName(), new Date(ze.getTime()), ze.isDirectory()); diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index c80126526..00fc81c22 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java @@ -273,9 +273,9 @@ public class Jar extends Zip { // must not use getEntry as "well behaving" applications // must accept the manifest in any capitalization - Enumeration enum = zf.entries(); - while (enum.hasMoreElements()) { - ZipEntry ze = (ZipEntry) enum.nextElement(); + Enumeration e = zf.entries(); + while (e.hasMoreElements()) { + ZipEntry ze = (ZipEntry) e.nextElement(); if (ze.getName().equalsIgnoreCase(MANIFEST_NAME)) { InputStreamReader isr = new InputStreamReader(zf.getInputStream(ze), "UTF-8"); @@ -448,9 +448,9 @@ public class Jar extends Zip { // JarIndex is sorting the directories by ascending order. // it's painful to do in JDK 1.1 and it has no value but cosmetic // since it will be read into a hashtable by the classloader. - Enumeration enum = addedDirs.keys(); - while (enum.hasMoreElements()) { - String dir = (String) enum.nextElement(); + Enumeration e = addedDirs.keys(); + while (e.hasMoreElements()) { + String dir = (String) e.nextElement(); // try to be smart, not to be fooled by a weird directory name // @fixme do we need to check for directories starting by ./ ? @@ -470,9 +470,9 @@ public class Jar extends Zip { writer.println(dir); } - enum = rootEntries.elements(); - while (enum.hasMoreElements()) { - writer.println(enum.nextElement()); + e = rootEntries.elements(); + while (e.hasMoreElements()) { + writer.println(e.nextElement()); } writer.flush(); diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 314f51d70..45b80340f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -1927,9 +1927,9 @@ public class Javadoc extends Task { true)); } - Enumeration enum = packagesToDoc.elements(); - while (enum.hasMoreElements()) { - String packageName = (String) enum.nextElement(); + Enumeration e = packagesToDoc.elements(); + while (e.hasMoreElements()) { + String packageName = (String) e.nextElement(); if (useExternalFile) { srcListWriter.println(packageName); } else { @@ -1937,9 +1937,9 @@ public class Javadoc extends Task { } } - enum = sourceFilesToDoc.elements(); - while (enum.hasMoreElements()) { - SourceFile sf = (SourceFile) enum.nextElement(); + e = sourceFilesToDoc.elements(); + while (e.hasMoreElements()) { + SourceFile sf = (SourceFile) e.nextElement(); String sourceFileName = sf.getFile().getAbsolutePath(); if (useExternalFile) { if (javadoc4 && sourceFileName.indexOf(" ") > -1) { @@ -2013,9 +2013,9 @@ public class Javadoc extends Task { * @since 1.5 */ private void addFileSets(Vector sf) { - Enumeration enum = fileSets.elements(); - while (enum.hasMoreElements()) { - FileSet fs = (FileSet) enum.nextElement(); + Enumeration e = fileSets.elements(); + while (e.hasMoreElements()) { + FileSet fs = (FileSet) e.nextElement(); if (!fs.hasPatterns() && !fs.hasSelectors()) { fs = (FileSet) fs.clone(); fs.createInclude().setName("**/*.java"); @@ -2047,9 +2047,9 @@ public class Javadoc extends Task { // and nested excludepackage elements if (sourcePath != null && packageNames.size() > 0) { PatternSet ps = new PatternSet(); - Enumeration enum = packageNames.elements(); - while (enum.hasMoreElements()) { - PackageName p = (PackageName) enum.nextElement(); + Enumeration e = packageNames.elements(); + while (e.hasMoreElements()) { + PackageName p = (PackageName) e.nextElement(); String pkg = p.getName().replace('.', '/'); if (pkg.endsWith("*")) { pkg += "*"; @@ -2057,9 +2057,9 @@ public class Javadoc extends Task { ps.createInclude().setName(pkg); } - enum = excludePackageNames.elements(); - while (enum.hasMoreElements()) { - PackageName p = (PackageName) enum.nextElement(); + e = excludePackageNames.elements(); + while (e.hasMoreElements()) { + PackageName p = (PackageName) e.nextElement(); String pkg = p.getName().replace('.', '/'); if (pkg.endsWith("*")) { pkg += "*"; @@ -2078,9 +2078,9 @@ public class Javadoc extends Task { } } - Enumeration enum = dirSets.elements(); - while (enum.hasMoreElements()) { - DirSet ds = (DirSet) enum.nextElement(); + Enumeration e = dirSets.elements(); + while (e.hasMoreElements()) { + DirSet ds = (DirSet) e.nextElement(); File baseDir = ds.getDir(getProject()); log("scanning " + baseDir + " for packages.", Project.MSG_DEBUG); DirectoryScanner dsc = ds.getDirectoryScanner(getProject()); diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 8ffe2ec64..8d23d9100 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -271,9 +271,9 @@ public class Replace extends MatchingTask { try { if (replaceFilterFile != null) { Properties props = getProperties(replaceFilterFile); - Enumeration enum = props.keys(); - while (enum.hasMoreElements()) { - String token = enum.nextElement().toString(); + Enumeration e = props.keys(); + while (e.hasMoreElements()) { + String token = e.nextElement().toString(); Replacefilter replaceFilter = createReplacefilter(); replaceFilter.setToken(token); replaceFilter.setValue(props.getProperty(token)); diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 13182f473..931a19573 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -194,10 +194,10 @@ public class UpToDate extends Task implements Condition { + " not found."); } - Enumeration enum = sourceFileSets.elements(); + Enumeration e = sourceFileSets.elements(); boolean upToDate = true; - while (upToDate && enum.hasMoreElements()) { - FileSet fs = (FileSet) enum.nextElement(); + while (upToDate && e.hasMoreElements()) { + FileSet fs = (FileSet) e.nextElement(); DirectoryScanner ds = fs.getDirectoryScanner(getProject()); upToDate = upToDate && scanDir(fs.getDir(getProject()), ds.getIncludedFiles()); diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index 445cb5d05..1116dfaeb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -1139,9 +1139,9 @@ public class Zip extends MatchingTask { entries.clear(); addingNewFiles = false; doUpdate = savedDoUpdate; - Enumeration enum = filesetsFromGroupfilesets.elements(); - while (enum.hasMoreElements()) { - ZipFileSet zf = (ZipFileSet) enum.nextElement(); + Enumeration e = filesetsFromGroupfilesets.elements(); + while (e.hasMoreElements()) { + ZipFileSet zf = (ZipFileSet) e.nextElement(); filesets.removeElement(zf); } filesetsFromGroupfilesets.removeAllElements();