File jrefactory-2.8.9-no-enums.patch of Package jrefactory

Index: jrefactory-2.8.9/src/org/acm/seguin/ide/common/ClassDiagramReloader.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/ide/common/ClassDiagramReloader.java	2001-10-18 12:56:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/ide/common/ClassDiagramReloader.java	2009-06-02 16:43:06.665805711 +0200
@@ -106,8 +106,8 @@
      *  Reload the diagrams
      */
     protected void reloadDiagrams() {
-        Enumeration enum = umlDiagrams.elements();
-        (new RefreshDiagramThread(enum)).start();
+        Enumeration enum2 = umlDiagrams.elements();
+        (new RefreshDiagramThread(enum2)).start();
     }
 
 
Index: jrefactory-2.8.9/src/org/acm/seguin/ide/common/RefreshDiagramThread.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/ide/common/RefreshDiagramThread.java	2001-10-18 12:56:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/ide/common/RefreshDiagramThread.java	2009-06-02 16:43:17.309941281 +0200
@@ -62,7 +62,7 @@
  *@created    October 18, 2001
  */
 class RefreshDiagramThread extends Thread {
-    private Enumeration enum;
+    private Enumeration enum2;
 
 
     /**
@@ -71,7 +71,7 @@
      *@param  init  Description of Parameter
      */
     RefreshDiagramThread(Enumeration init) {
-        enum = init;
+        enum2 = init;
     }
 
 
@@ -81,8 +81,8 @@
     public void run() {
         SummaryLoaderThread.waitForLoading();
 
-        while (enum.hasMoreElements()) {
-            UMLPackage next = (UMLPackage) enum.nextElement();
+        while (enum2.hasMoreElements()) {
+            UMLPackage next = (UMLPackage) enum2.nextElement();
             next.reload();
         }
     }
Index: jrefactory-2.8.9/src/org/acm/seguin/ide/common/options/JSTagsOptionPane.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/ide/common/options/JSTagsOptionPane.java	2003-10-01 17:49:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/ide/common/options/JSTagsOptionPane.java	2009-06-02 16:42:39.880987831 +0200
@@ -397,8 +397,8 @@
          *  Description of the Method
          */
         public void save() {
-            for (Enumeration enum = entries.elements(); enum.hasMoreElements(); ) {
-                Entry e = (Entry) enum.nextElement();
+            for (Enumeration enum2 = entries.elements(); enum2.hasMoreElements(); ) {
+                Entry e = (Entry) enum2.nextElement();
                 if (e.required || e.descr.length() > 0) {
                     props.setString("tagDescr." + e.tag, e.descr);
                 } else {
Index: jrefactory-2.8.9/src/org/acm/seguin/ide/jedit/JEditPrettyPrinter.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/ide/jedit/JEditPrettyPrinter.java	2003-09-27 08:41:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/ide/jedit/JEditPrettyPrinter.java	2009-06-02 16:43:27.665131152 +0200
@@ -132,10 +132,10 @@
                buffer.insert(0, contents);
 
                // restore markers:
-               Enumeration enum = markers.elements();
+               Enumeration enum2 = markers.elements();
 
-               while (enum.hasMoreElements()) {
-                  Marker marker = (Marker)enum.nextElement();
+               while (enum2.hasMoreElements()) {
+                  Marker marker = (Marker)enum2.nextElement();
 
                   buffer.addMarker(marker.getShortcut(), marker.getPosition());
                }
Index: jrefactory-2.8.9/src/org/acm/seguin/io/ExtensionFileFilter.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/io/ExtensionFileFilter.java	2001-07-03 11:18:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/io/ExtensionFileFilter.java	2009-06-02 16:43:34.160986978 +0200
@@ -79,9 +79,9 @@
 			return true;
 		}
 
-		Enumeration enum = extensions.elements();
-		while (enum.hasMoreElements()) {
-			String ext = ((String) enum.nextElement()).toLowerCase();
+		Enumeration enum2 = extensions.elements();
+		while (enum2.hasMoreElements()) {
+			String ext = ((String) enum2.nextElement()).toLowerCase();
 
 			String filename = file.getName().toLowerCase();
 			if (filename.endsWith(ext)) {
Index: jrefactory-2.8.9/src/org/acm/seguin/parser/JavaParser.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/parser/JavaParser.java	2003-10-07 15:45:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/parser/JavaParser.java	2009-06-02 16:43:53.268987557 +0200
@@ -12844,8 +12844,8 @@
         jj_expentry[i] = jj_lasttokens[i];
       }
       boolean exists = false;
-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
-        int[] oldentry = (int[])(enum.nextElement());
+      for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) {
+        int[] oldentry = (int[])(enum2.nextElement());
         if (oldentry.length == jj_expentry.length) {
           exists = true;
           for (int i = 0; i < jj_expentry.length; i++) {
Index: jrefactory-2.8.9/src/org/acm/seguin/pmd/cpd/cppast/CPPParser.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/pmd/cpd/cppast/CPPParser.java	2003-07-29 21:51:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/pmd/cpd/cppast/CPPParser.java	2009-06-02 16:44:04.196987420 +0200
@@ -9758,8 +9758,8 @@
         jj_expentry[i] = jj_lasttokens[i];
       }
       boolean exists = false;
-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
-        int[] oldentry = (int[])(enum.nextElement());
+      for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) {
+        int[] oldentry = (int[])(enum2.nextElement());
         if (oldentry.length == jj_expentry.length) {
           exists = true;
           for (int i = 0; i < jj_expentry.length; i++) {
Index: jrefactory-2.8.9/src/org/acm/seguin/project/Path.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/project/Path.java	2003-09-04 20:47:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/project/Path.java	2009-06-02 16:44:22.437637204 +0200
@@ -471,9 +471,9 @@
             return;
         }
 
-        Enumeration enum = elements.elements();
-        while (enum.hasMoreElements()) {
-            Object o = enum.nextElement();
+        Enumeration enum2 = elements.elements();
+        while (enum2.hasMoreElements()) {
+            Object o = enum2.nextElement();
             //if (o instanceof Reference) {
             //    o = ((Reference) o).getReferencedObject(p);
             //}
Index: jrefactory-2.8.9/src/org/acm/seguin/project/ProjectClassLoader.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/project/ProjectClassLoader.java	2003-09-04 20:47:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/project/ProjectClassLoader.java	2009-06-02 16:44:32.369340443 +0200
@@ -405,14 +405,14 @@
     public String getClasspath(){
         StringBuffer sb = new StringBuffer();
         boolean firstPass = true;
-        Enumeration enum = pathComponents.elements();
-        while (enum.hasMoreElements()) {
+        Enumeration enum2 = pathComponents.elements();
+        while (enum2.hasMoreElements()) {
             if (!firstPass) {
                 sb.append(System.getProperty("path.separator"));
             } else {
                 firstPass = false;
             }
-            sb.append(((File) enum.nextElement()).getAbsolutePath());
+            sb.append(((File) enum2.nextElement()).getAbsolutePath());
         }
         return sb.toString();
     }
Index: jrefactory-2.8.9/src/org/acm/seguin/refactor/type/AddClassRefactoring.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/refactor/type/AddClassRefactoring.java	2003-09-13 22:38:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/refactor/type/AddClassRefactoring.java	2009-06-02 16:44:41.348986905 +0200
@@ -94,9 +94,9 @@
 				(TypeSummary) summaryList.elementAt(0);
 		TypeSummary originalParent = 
 				GetTypeSummary.query(anySummary.getParentClass());
-		Enumeration enum = summaryList.elements();
-		while (enum.hasMoreElements()) {
-			TypeSummary typeSummary = (TypeSummary) enum.nextElement();
+		Enumeration enum2 = summaryList.elements();
+		while (enum2.hasMoreElements()) {
+			TypeSummary typeSummary = (TypeSummary) enum2.nextElement();
 			if (typeSummary.isInterface()) {
 				throw new RefactoringException("This refactoring only works for classes, not interfaces");
 			}
@@ -119,9 +119,9 @@
 	 *  Performs the transform on the rest of the classes 
 	 */
 	protected void transform() {
-		Enumeration enum = summaryList.elements();
-		while (enum.hasMoreElements()) {
-			TypeSummary typeSummary = (TypeSummary) enum.nextElement();
+		Enumeration enum2 = summaryList.elements();
+		while (enum2.hasMoreElements()) {
+			TypeSummary typeSummary = (TypeSummary) enum2.nextElement();
 			transformOriginal(typeSummary);
 		}
 
Index: jrefactory-2.8.9/src/org/acm/seguin/tools/RefactoryStorage.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/tools/RefactoryStorage.java	2003-09-13 16:25:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/tools/RefactoryStorage.java	2009-06-02 16:45:29.000987300 +0200
@@ -154,9 +154,9 @@
     private void load() {
         try {
             FileSettings settings = FileSettings.getRefactorySettings("refactory");
-            Enumeration enum = settings.getKeys();
-            while (enum.hasMoreElements()) {
-                String next = (String) enum.nextElement();
+            Enumeration enum2 = settings.getKeys();
+            while (enum2.hasMoreElements()) {
+                String next = (String) enum2.nextElement();
                 map.put(next, new Integer(settings.getInteger(next)));
             }
         } catch (MissingSettingsException mse) {
Index: jrefactory-2.8.9/src/org/acm/seguin/tools/install/RefactoryStorage.java
===================================================================
--- jrefactory-2.8.9.orig/src/org/acm/seguin/tools/install/RefactoryStorage.java	2003-09-01 01:25:00.000000000 +0200
+++ jrefactory-2.8.9/src/org/acm/seguin/tools/install/RefactoryStorage.java	2009-06-02 16:45:04.125217167 +0200
@@ -154,9 +154,9 @@
     private void load() {
         try {
             FileSettings settings = FileSettings.getRefactorySettings("refactory");
-            Enumeration enum = settings.getKeys();
-            while (enum.hasMoreElements()) {
-                String next = (String) enum.nextElement();
+            Enumeration enum2 = settings.getKeys();
+            while (enum2.hasMoreElements()) {
+                String next = (String) enum2.nextElement();
                 map.put(next, new Integer(settings.getInteger(next)));
             }
         } catch (MissingSettingsException mse) {