From 0f50072e9a93b49d0510128adafe9c5f22813e73 Mon Sep 17 00:00:00 2001 From: mkoch Date: Mon, 31 May 2004 09:23:05 +0000 Subject: 2004-05-31 Michael Koch * 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 --- libjava/java/io/SequenceInputStream.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libjava/java/io/SequenceInputStream.java') diff --git a/libjava/java/io/SequenceInputStream.java b/libjava/java/io/SequenceInputStream.java index adc9b86b8ce..e7b2f494c2a 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 SequenceInputStream 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) -- cgit v1.2.3