BeanInfoEmbryo.java, [...]: Rename enum to e because enum is a keyword in Java 1.5.

2004-05-30  Michael Koch  <konqueror@gmx.de>

	* gnu/java/beans/BeanInfoEmbryo.java,
	java/awt/im/InputContext.java,
	javax/swing/tree/DefaultMutableTreeNode.java:
	Rename enum to e because enum is a keyword in Java 1.5.

From-SVN: r82447

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0a20670900ed20cf1399cd8815162e657a6b9e00..be6629e8582aad75b5589a7626c30544b5c1de4d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-30  Michael Koch  <konqueror@gmx.de>
+
+       * gnu/java/beans/BeanInfoEmbryo.java,
+       java/awt/im/InputContext.java,
+       javax/swing/tree/DefaultMutableTreeNode.java:
+       Rename enum to e because enum is a keyword in Java 1.5.
+
 2004-05-30  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/math/MPN.java,

diff --git a/libjava/gnu/java/beans/BeanInfoEmbryo.java b/libjava/gnu/java/beans/BeanInfoEmbryo.java
index 16738fe60487b5b83f869257489cc1a149c59f3f..2dc1166527eea1319e3dd8d72d97c61b1445a0ed 100644 (file)
--- a/libjava/gnu/java/beans/BeanInfoEmbryo.java
+++ b/libjava/gnu/java/beans/BeanInfoEmbryo.java
@@ -85,9 +85,9 @@ public class BeanInfoEmbryo {
 
                PropertyDescriptor[] Aproperties = new PropertyDescriptor[properties.size()];
                int i = 0;
-               Enumeration enum = properties.elements();
-               while(enum.hasMoreElements()) {
-                       Aproperties[i] = (PropertyDescriptor)enum.nextElement();
+               Enumeration e = properties.elements();
+               while (e.hasMoreElements()) {
+                       Aproperties[i] = (PropertyDescriptor) e.nextElement();
                        if(defaultPropertyName != null && Aproperties[i].getName().equals(defaultPropertyName)) {
                                defaultProperty = i;
                        }
@@ -96,9 +96,9 @@ public class BeanInfoEmbryo {
 
                EventSetDescriptor[] Aevents = new EventSetDescriptor[events.size()];
                i = 0;
-               enum = events.elements();
-               while(enum.hasMoreElements()) {
-                       Aevents[i] = (EventSetDescriptor)enum.nextElement();
+               e = events.elements();
+               while (e.hasMoreElements()) {
+                       Aevents[i] = (EventSetDescriptor) e.nextElement();
                        if(defaultEventName != null && Aevents[i].getName().equals(defaultEventName)) {
                                defaultEvent = i;
                        }

diff --git a/libjava/java/awt/im/InputContext.java b/libjava/java/awt/im/InputContext.java
index ab483377d4f0325daba2ac64dc406f8fc234d7b5..c8e7cf35a4c74a5b497c74d95cdecc015b88a6e5 100644 (file)
--- a/libjava/java/awt/im/InputContext.java
+++ b/libjava/java/awt/im/InputContext.java
@@ -86,20 +86,20 @@ public class InputContext
   private static final ArrayList descriptors = new ArrayList();
   static
   {
-    Enumeration enum;
+    Enumeration e;
     try
       {
-        enum = ClassLoader.getSystemResources
+        e = ClassLoader.getSystemResources
           ("META_INF/services/java.awt.im.spi.InputMethodDescriptor");
       }
     catch (IOException ex)
       {
         // XXX Should we do something else?
-        enum = EmptyEnumeration.getInstance();
+        e = EmptyEnumeration.getInstance();
       }
-    while (enum.hasMoreElements())
+    while (e.hasMoreElements())
       {
-        URL url = (URL) enum.nextElement();
+        URL url = (URL) e.nextElement();
         BufferedReader in;
         String line;
         try
@@ -125,7 +125,7 @@ public class InputContext
                   }
                 line = in.readLine().trim();
               }
-            catch (IOException e)
+            catch (IOException ex)
               {
                 continue outer;
               }

diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode.java b/libjava/javax/swing/tree/DefaultMutableTreeNode.java
index 020e7410f9766b265e56604dbaa348c722694ef3..b6dd1d0b8705c6938b0d112a9796f7b6fcdaa729 100644 (file)
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode.java
@@ -997,17 +997,17 @@ public class DefaultMutableTreeNode
        public int getLeafCount() {
 
                // Variables
-               Enumeration     enum;
+               Enumeration     e;
                int                     count;
                TreeNode        current;
 
                // Get Enumeration of all descendants
-               enum = depthFirstEnumeration();
+               e = depthFirstEnumeration();
 
                // Process Nodes
                count = 0;
-               while (enum.hasMoreElements() == true) {
-                       current = (TreeNode) enum.nextElement();
+               while (e.hasMoreElements() == true) {
+                       current = (TreeNode) e.nextElement();
                        if (current.isLeaf() == true) {
                                count++;
                        } // if