This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: java.io.SequenceInputStream
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 31 May 2004 11:25:42 +0200
- Subject: Patch: java.io.SequenceInputStream
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patch to merge a fix to
java/io/SequenceInputStream.java which removed the usage of the
"enum" keyword of Java 1.5.
Michael
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.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFAuvoWWSOgCCdjSDsRApR6AJ0Xtb9wHJ1ACtWBY/my+FSYfsemjACbB+dX
Ix7UGV3PiJQIBeAYuwJULCE=
=S2NX
-----END PGP SIGNATURE-----
Index: java/io/SequenceInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/SequenceInputStream.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 SequenceInputStream.java
--- java/io/SequenceInputStream.java 22 Jan 2002 22:40:14 -0000 1.6
+++ java/io/SequenceInputStream.java 31 May 2004 09:22:35 -0000
@@ -71,8 +71,8 @@
/** 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 SequenceInputStream(Enumeration e)
{
- enum = e;
- in = (InputStream) enum.nextElement();
+ this.e = e;
+ in = (InputStream) e.nextElement();
in2 = null;
}
@@ -204,10 +204,10 @@
{
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)