removing enum variabe

PR: 22345
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275075 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/taskdefs/condition/And.java

@@ -74,9 +74,9 @@ public class And extends ConditionBase implements Condition {
      * @exception BuildException if an error occurs
      */
     public boolean eval() throws BuildException {
-        Enumeration enum = getConditions();
-        while (enum.hasMoreElements()) {
-            Condition c = (Condition) enum.nextElement();
+        Enumeration e = getConditions();
+        while (e.hasMoreElements()) {
+            Condition c = (Condition) e.nextElement();
             if (!c.eval()) {
                 return false;
             }

src/main/org/apache/tools/ant/taskdefs/condition/Or.java

@@ -74,9 +74,9 @@ public class Or extends ConditionBase implements Condition {
      * @exception BuildException if an error occurs
      */
     public boolean eval() throws BuildException {
-        Enumeration enum = getConditions();
-        while (enum.hasMoreElements()) {
-            Condition c = (Condition) enum.nextElement();
+        Enumeration e = getConditions();
+        while (e.hasMoreElements()) {
+            Condition c = (Condition) e.nextElement();
             if (c.eval()) {
                 return true;
             }

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

@@ -103,10 +103,10 @@ class ChangeLogParser {
      */
     CVSEntry[] getEntrySetAsArray() {
         final CVSEntry[] array = new CVSEntry[ m_entries.size() ];
-        Enumeration enum = m_entries.elements();
+        Enumeration e = m_entries.elements();
         int i = 0;
-        while (enum.hasMoreElements()) {
-            array[i++] = (CVSEntry) enum.nextElement();
+        while (e.hasMoreElements()) {
+            array[i++] = (CVSEntry) e.nextElement();
         }
         return array;
     }

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

@@ -302,9 +302,9 @@ public class EchoProperties extends Task {
             }
         }
 
-        Enumeration enum = propertySets.elements();
-        while (enum.hasMoreElements()) {
-            PropertySet ps = (PropertySet) enum.nextElement();
+        Enumeration e = propertySets.elements();
+        while (e.hasMoreElements()) {
+            PropertySet ps = (PropertySet) e.nextElement();
             CollectionUtils.putAll(allProps, ps.getProperties());
         }
 
@@ -348,7 +348,7 @@ public class EchoProperties extends Task {
             if (os != null) {
                 try {
                     os.close();
-                } catch (IOException e) {
+                } catch (IOException ex) {
                     //ignore
                 }
             }
@@ -369,9 +369,9 @@ public class EchoProperties extends Task {
     protected void saveProperties(Hashtable allProps, OutputStream os)
              throws IOException, BuildException {
         Properties props = new Properties();
-        Enumeration enum = allProps.keys();
-        while (enum.hasMoreElements()) {
-            String name = enum.nextElement().toString();
+        Enumeration e = allProps.keys();
+        while (e.hasMoreElements()) {
+            String name = e.nextElement().toString();
             String value = allProps.get(name).toString();
             props.put(name, value);
         }

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

@@ -449,9 +449,9 @@ public class Javah extends Task {
             }
         }
 
-        Enumeration enum = classes.elements();
-        while (enum.hasMoreElements()) {
-            ClassArgument arg = (ClassArgument) enum.nextElement();
+        Enumeration e = classes.elements();
+        while (e.hasMoreElements()) {
+            ClassArgument arg = (ClassArgument) e.nextElement();
             String aClass = arg.getName();
             cmd.createArgument().setValue(aClass);
             niceClassList.append("    " + aClass + lSep);

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

@@ -701,10 +701,10 @@ public class NetRexxC extends MatchingTask {
                  + (filecopyList.size() == 1 ? "" : "s")
                  + " to " + destDir.getAbsolutePath());
 
-            Enumeration enum = filecopyList.keys();
+            Enumeration e = filecopyList.keys();
 
-            while (enum.hasMoreElements()) {
-                String fromFile = (String) enum.nextElement();
+            while (e.hasMoreElements()) {
+                String fromFile = (String) e.nextElement();
                 String toFile = (String) filecopyList.get(fromFile);
 
                 try {

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

@@ -310,8 +310,8 @@ public class Rpm extends Task {
     protected String guessRpmBuildCommand() {
         Vector env = Execute.getProcEnvironment();
         String path = null;
-        for (Enumeration enum = env.elements(); enum.hasMoreElements();) {
-            String var = (String) enum.nextElement();
+        for (Enumeration e = env.elements(); e.hasMoreElements();) {
+            String var = (String) e.nextElement();
             if (var.startsWith("PATH=") || var.startsWith("Path=")) {
                 path = var.substring(6 /* "PATH=".length() + 1 */);
                 break;

src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java

@@ -138,9 +138,9 @@ public class ServerDeploy extends Task {
      *  are invalid or incomplete, or a failure occurs in the deployment process.
      */
     public void execute() throws BuildException {
-        for (Enumeration enum = vendorTools.elements();
-             enum.hasMoreElements();) {
-            HotDeploymentTool tool = (HotDeploymentTool) enum.nextElement();
+        for (Enumeration e = vendorTools.elements();
+             e.hasMoreElements();) {
+            HotDeploymentTool tool = (HotDeploymentTool) e.nextElement();
             tool.validateAttributes();
             tool.deploy();
         }

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

@@ -614,9 +614,9 @@ public class JspC extends MatchingTask {
      */
     public void deleteEmptyJavaFiles() {
         if (javaFiles != null) {
-            Enumeration enum = javaFiles.elements();
-            while (enum.hasMoreElements()) {
-                File file = (File) enum.nextElement();
+            Enumeration e = javaFiles.elements();
+            while (e.hasMoreElements()) {
+                File file = (File) e.nextElement();
                 if (file.exists() && file.length() == 0) {
                     log("deleting empty output file " + file);
                     file.delete();

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

@@ -91,9 +91,9 @@ public abstract class DefaultJspCompilerAdapter
 
         niceSourceList.append(lSep);
 
-        Enumeration enum = compileList.elements();
-        while (enum.hasMoreElements()) {
-            String arg = (String) enum.nextElement();
+        Enumeration e = compileList.elements();
+        while (e.hasMoreElements()) {
+            String arg = (String) e.nextElement();
             cmd.createArgument().setValue(arg);
             niceSourceList.append("    " + arg + lSep);
         }

src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java

@@ -204,9 +204,9 @@ public class JUnitTask extends Task {
      * @since Ant 1.5
      */
     public void setFiltertrace(boolean value) {
-        Enumeration enum = allTests();
-        while (enum.hasMoreElements()) {
-            BaseTest test = (BaseTest) enum.nextElement();
+        Enumeration e = allTests();
+        while (e.hasMoreElements()) {
+            BaseTest test = (BaseTest) e.nextElement();
             test.setFiltertrace(value);
         }
     }
@@ -222,9 +222,9 @@ public class JUnitTask extends Task {
      * @since Ant 1.2
      */
     public void setHaltonerror(boolean value) {
-        Enumeration enum = allTests();
-        while (enum.hasMoreElements()) {
-            BaseTest test = (BaseTest) enum.nextElement();
+        Enumeration e = allTests();
+        while (e.hasMoreElements()) {
+            BaseTest test = (BaseTest) e.nextElement();
             test.setHaltonerror(value);
         }
     }
@@ -241,9 +241,9 @@ public class JUnitTask extends Task {
      * @since Ant 1.4
      */
     public void setErrorProperty(String propertyName) {
-        Enumeration enum = allTests();
-        while (enum.hasMoreElements()) {
-            BaseTest test = (BaseTest) enum.nextElement();
+        Enumeration e = allTests();
+        while (e.hasMoreElements()) {
+            BaseTest test = (BaseTest) e.nextElement();
             test.setErrorProperty(propertyName);
         }
     }
@@ -260,9 +260,9 @@ public class JUnitTask extends Task {
      * @since Ant 1.2
      */
     public void setHaltonfailure(boolean value) {
-        Enumeration enum = allTests();
-        while (enum.hasMoreElements()) {
-            BaseTest test = (BaseTest) enum.nextElement();
+        Enumeration e = allTests();
+        while (e.hasMoreElements()) {
+            BaseTest test = (BaseTest) e.nextElement();
             test.setHaltonfailure(value);
         }
     }
@@ -279,9 +279,9 @@ public class JUnitTask extends Task {
      * @since Ant 1.4
      */
     public void setFailureProperty(String propertyName) {
-        Enumeration enum = allTests();
-        while (enum.hasMoreElements()) {
-            BaseTest test = (BaseTest) enum.nextElement();
+        Enumeration e = allTests();
+        while (e.hasMoreElements()) {
+            BaseTest test = (BaseTest) e.nextElement();
             test.setFailureProperty(propertyName);
         }
     }
@@ -300,9 +300,9 @@ public class JUnitTask extends Task {
      * @since Ant 1.2
      */
     public void setFork(boolean value) {
-        Enumeration enum = allTests();
-        while (enum.hasMoreElements()) {
-            BaseTest test = (BaseTest) enum.nextElement();
+        Enumeration e = allTests();
+        while (e.hasMoreElements()) {
+            BaseTest test = (BaseTest) e.nextElement();
             test.setFork(value);
         }
     }
@@ -739,8 +739,8 @@ public class JUnitTask extends Task {
                                       + propsFile.getAbsolutePath());
         Hashtable p = getProject().getProperties();
         Properties props = new Properties();
-        for (Enumeration enum = p.keys(); enum.hasMoreElements();) {
-            Object key = enum.nextElement();
+        for (Enumeration e = p.keys(); e.hasMoreElements();) {
+            Object key = e.nextElement();
             props.put(key, p.get(key));
         }
         try {

src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java

@@ -525,8 +525,8 @@ public class JUnitTestRunner implements TestListener {
 
         // Add/overlay system properties on the properties from the Ant project
         Hashtable p = System.getProperties();
-        for (Enumeration enum = p.keys(); enum.hasMoreElements();) {
-            Object key = enum.nextElement();
+        for (Enumeration e = p.keys(); e.hasMoreElements();) {
+            Object key = e.nextElement();
             props.put(key, p.get(key));
         }
         t.setProperties(props);

src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java

@@ -165,10 +165,10 @@ public class XMLResultAggregator extends Task implements XMLConstants {
             throw new BuildException("Unable to write test aggregate to '" + destFile + "'", e);
         }
         // apply transformation
-        Enumeration enum = transformers.elements();
-        while (enum.hasMoreElements()) {
+        Enumeration e = transformers.elements();
+        while (e.hasMoreElements()) {
             AggregateTransformer transformer =
-                (AggregateTransformer) enum.nextElement();
+                (AggregateTransformer) e.nextElement();
             transformer.setXmlDocument(rootElement.getOwnerDocument());
             transformer.transform();
         }

src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java

@@ -198,9 +198,9 @@ public class XMLReport {
         // Iterate over the classpath to identify reference classes
         classFiles = new Hashtable();
         ClassPathLoader cpl = new ClassPathLoader(classPath);
-        Enumeration enum = cpl.loaders();
-        while (enum.hasMoreElements()) {
-            ClassPathLoader.FileLoader fl = (ClassPathLoader.FileLoader) enum.nextElement();
+        Enumeration e = cpl.loaders();
+        while (e.hasMoreElements()) {
+            ClassPathLoader.FileLoader fl = (ClassPathLoader.FileLoader) e.nextElement();
             ClassFile[] classes = fl.getClasses();
             log("Processing " + classes.length + " classes in " + fl.getFile());
             // process all classes
@@ -435,9 +435,9 @@ public class XMLReport {
         int total_lines = 0;
 
         // use the map for access, all nodes should be there
-        Enumeration enum = pkgMap.elements();
-        while (enum.hasMoreElements()) {
-            Element pkgElem = (Element) enum.nextElement();
+        Enumeration e = pkgMap.elements();
+        while (e.hasMoreElements()) {
+            Element pkgElem = (Element) e.nextElement();
             String pkgname = pkgElem.getAttribute("name");
             Element[] classes = getClasses(pkgElem);
             int pkg_calls = 0;
@@ -461,10 +461,10 @@ public class XMLReport {
                     pkg_total_methods += Integer.parseInt(covdata.getAttribute("total_methods"));
                     pkg_hit_lines += Integer.parseInt(covdata.getAttribute("hit_lines"));
                     pkg_total_lines += Integer.parseInt(covdata.getAttribute("total_lines"));
-                } catch (NumberFormatException e) {
+                } catch (NumberFormatException ex) {
                     log("Error parsing '" + classname + "' (" + j + "/"
                         + classes.length + ") in package '" + pkgname + "'");
-                    throw e;
+                    throw ex;
                 }
             }
             Element covdata = getCovDataChild(pkgElem);

src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java

@@ -145,9 +145,9 @@ public class ClassPathLoader {
      */
     public Hashtable getClasses() throws IOException {
         Hashtable map = new Hashtable();
-        Enumeration enum = loaders();
-        while (enum.hasMoreElements()) {
-            FileLoader loader = (FileLoader) enum.nextElement();
+        Enumeration e = loaders();
+        while (e.hasMoreElements()) {
+            FileLoader loader = (FileLoader) e.nextElement();
             System.out.println("Processing " + loader.getFile());
             long t0 = System.currentTimeMillis();
             ClassFile[] classes = loader.getClasses();