From: aclement <aclement>
Date: Mon, 24 Jan 2005 14:33:05 +0000 (+0000)
Subject: Matthew fix for 83380: don't use enum as a variable name.
X-Git-Tag: Root_AspectJ5_Development~68
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=159d6bd9422fc8ab300cfb88280d7ef3bf910a95;p=aspectj.git

Matthew fix for 83380: don't use enum as a variable name.
---

diff --git a/bridge/src/org/aspectj/bridge/CountingMessageHandler.java b/bridge/src/org/aspectj/bridge/CountingMessageHandler.java
index 6c05253ee..3cdd7d482 100644
--- a/bridge/src/org/aspectj/bridge/CountingMessageHandler.java
+++ b/bridge/src/org/aspectj/bridge/CountingMessageHandler.java
@@ -87,8 +87,8 @@ public class CountingMessageHandler implements IMessageHandler {
         }
         int result = 0;
         if (null == kind) {            
-            for (Enumeration enum = counters.elements(); enum.hasMoreElements();) {
-				result += ((IntHolder) enum.nextElement()).count;				
+            for (Enumeration enu = counters.elements(); enu.hasMoreElements();) {
+				result += ((IntHolder) enu.nextElement()).count;				
 			}
         } else if (!orGreater) {
             result = numMessages(kind);
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
index d24b79657..1d4528a6c 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
@@ -376,12 +376,12 @@ public class Checklics extends MatchingTask {
 //	}
 
 	private void list() {
-		Enumeration enum = LICENSES.keys();
+		Enumeration enu = LICENSES.keys();
 		StringBuffer sb = new StringBuffer();
 		sb.append("known license keys:");
 		boolean first = true;
-		while (enum.hasMoreElements()) {
-			sb.append((first ? " " : ", ") + enum.nextElement());
+		while (enu.hasMoreElements()) {
+			sb.append((first ? " " : ", ") + enu.nextElement());
 			if (first) {
 				first = false;
 			}
diff --git a/testing/src/org/aspectj/testing/util/FileUtil.java b/testing/src/org/aspectj/testing/util/FileUtil.java
index b68d7f8b2..543da5801 100644
--- a/testing/src/org/aspectj/testing/util/FileUtil.java
+++ b/testing/src/org/aspectj/testing/util/FileUtil.java
@@ -217,9 +217,9 @@ public class FileUtil {
         if (null == visitor) throw new IllegalArgumentException("null visitor");
         int index = 0;
         try {
-            Enumeration enum = zipfile.entries();
-            while (enum.hasMoreElements()) {
-                ZipEntry entry = (ZipEntry) enum.nextElement();
+            Enumeration enu = zipfile.entries();
+            while (enu.hasMoreElements()) {
+                ZipEntry entry = (ZipEntry) enu.nextElement();
                 index++;
                 if (! visitor.accept(entry.getName())) {
                     break;
@@ -366,9 +366,9 @@ public class FileUtil {
         ZipFile zip = null;
         try {
             zip = new ZipFile(zipfile); // ZipFile.OPEN_READ| ZipFile.OPEN_DELETE); delete is 1.3 only
-            Enumeration enum = zip.entries();
-            while (enum.hasMoreElements()) {
-                results.add(renderZipEntry(zipfile, (ZipEntry) enum.nextElement()));
+            Enumeration enu = zip.entries();
+            while (enu.hasMoreElements()) {
+                results.add(renderZipEntry(zipfile, (ZipEntry) enu.nextElement()));
             }
             zip.close();
             zip = null;