procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Michael Koch 2004-05-31 09:23:05 +00:00 • committed by Michael Koch
parent 771b9ca31f
commit 58128b9da1
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -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> 2004-05-31 Michael Koch <konqueror@gmx.de>
* gnu/java/rmi/rmic/CompilerProcess.java: * gnu/java/rmi/rmic/CompilerProcess.java:

14
libjava/java/io/SequenceInputStream.java
View file

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