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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82479 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7901df2..7b63645 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
 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:
        Fixed javadoc to by XHTML compliant.
 

diff --git a/libjava/java/io/SequenceInputStream.java b/libjava/java/io/SequenceInputStream.java
index adc9b86..e7b2f49 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)