SequenceInputStream.java: Rename enum to e because enum is a keyword in Java 1.5.

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

	* java/io/SequenceInputStream.java:
	Rename enum to e because enum is a keyword in Java 1.5.

From-SVN: r82479

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7901df26ece7ba6c91fb86b3e73bb91d54ef990d..7b63645a81d892f0217d98d685c93519d9ed361e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-31  Michael Koch  <konqueror@gmx.de>
+
+       * java/io/SequenceInputStream.java:
+       Rename enum to e because enum is a keyword in Java 1.5.
+
 2004-05-31  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/rmi/rmic/CompilerProcess.java:

diff --git a/libjava/java/io/SequenceInputStream.java b/libjava/java/io/SequenceInputStream.java
index adc9b86b8ced6fc50da75c260d49284037a37d33..e7b2f494c2acd863fa5fbddda0632eb2b2ce054e 100644 (file)
--- a/libjava/java/io/SequenceInputStream.java
+++ b/libjava/java/io/SequenceInputStream.java
@@ -71,8 +71,8 @@ public class SequenceInputStream extends InputStream
   /** Secondary input stream; not used if constructed w/ enumeration. */
   private InputStream in2;
 
-  /** The enum handle; not used if constructed w/ 2 explicit input streams. */
-  private Enumeration enum;
+  /** The enumeration handle; not used if constructed w/ 2 explicit input streams. */
+  private Enumeration e;
 
  /**
   * This method creates a new <code>SequenceInputStream</code> that obtains
@@ -84,8 +84,8 @@ public class SequenceInputStream extends InputStream
   */
   public SequenceInputStream(Enumeration e)
   {
-    enum = e;
-    in = (InputStream) enum.nextElement();
+    this.e = e;
+    in = (InputStream) e.nextElement();
     in2 = null;
   }
 
@@ -204,10 +204,10 @@ public class SequenceInputStream extends InputStream
   {
     InputStream nextIn = null;
 
-    if (enum != null)
+    if (e != null)
       {
-        if (enum.hasMoreElements())
-         nextIn = (InputStream) enum.nextElement();
+        if (e.hasMoreElements())
+         nextIn = (InputStream) e.nextElement();
       }
     else
       if (in2 != null)