From fd52619362272fa237c06a6f473744af308a7be4 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Wed, 13 Aug 2003 15:02:29 +0000 Subject: [PATCH] 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 --- .../tools/ant/taskdefs/condition/And.java | 6 +-- .../tools/ant/taskdefs/condition/Or.java | 6 +-- .../ant/taskdefs/cvslib/ChangeLogParser.java | 6 +-- .../ant/taskdefs/optional/EchoProperties.java | 14 +++---- .../tools/ant/taskdefs/optional/Javah.java | 6 +-- .../tools/ant/taskdefs/optional/NetRexxC.java | 6 +-- .../tools/ant/taskdefs/optional/Rpm.java | 4 +- .../taskdefs/optional/j2ee/ServerDeploy.java | 6 +-- .../tools/ant/taskdefs/optional/jsp/JspC.java | 6 +-- .../compilers/DefaultJspCompilerAdapter.java | 6 +-- .../taskdefs/optional/junit/JUnitTask.java | 40 +++++++++---------- .../optional/junit/JUnitTestRunner.java | 4 +- .../optional/junit/XMLResultAggregator.java | 6 +-- .../taskdefs/optional/sitraka/XMLReport.java | 16 ++++---- .../sitraka/bytecode/ClassPathLoader.java | 6 +-- 15 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/And.java b/src/main/org/apache/tools/ant/taskdefs/condition/And.java index 21e345ae0..9559f4ddc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/And.java +++ b/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; } diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java index 10b3496c1..3130c6bb1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java +++ b/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; } diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java index e32b3c7e3..1d81cfdec 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java +++ b/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; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java index 8b2ff0a83..2d713f20f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java +++ b/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); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index 3297fff7a..520ad8d17 100755 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/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); 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 8c6ef7bfa..1c07d78a9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/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 { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java index 97054e13d..63a856287 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java index c43671cfe..d6636ad1a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java +++ b/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(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index e72479eab..fbeed2563 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/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(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java index 231318e81..659e82316 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java +++ b/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); } 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 4704b3ba4..ec650aa72 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 @@ -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 { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 7aa93062c..e9436af18 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/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); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index a6eb74cdf..fef8996be 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/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(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java index 95f3da78d..54bff0251 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java +++ b/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); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java index 095ee70da..a889e3b45 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java +++ b/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();