aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/io/SequenceInputStream.java
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2004-05-31 09:23:05 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2004-05-31 09:23:05 +0000
commit58128b9da11df305d8e631bcbbaa6aad2ad970d6 (patch)
treeecdba4617b22c5125f39685aae40ab783b99b675 /libjava/java/io/SequenceInputStream.java
parent771b9ca31fd14342715c581d690d584d0e1df3cb (diff)
downloadgcc-58128b9da11df305d8e631bcbbaa6aad2ad970d6.zip
gcc-58128b9da11df305d8e631bcbbaa6aad2ad970d6.tar.gz
gcc-58128b9da11df305d8e631bcbbaa6aad2ad970d6.tar.bz2
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
Diffstat (limited to 'libjava/java/io/SequenceInputStream.java')
-rw-r--r--libjava/java/io/SequenceInputStream.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/libjava/java/io/SequenceInputStream.java b/libjava/java/io/SequenceInputStream.java
index adc9b86..e7b2f49 100644
--- 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)