This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: More Classpath merging
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Subject: Patch: FYI: More Classpath merging
- From: Tom Tromey <tromey at redhat dot com>
- Date: 31 Aug 2001 19:09:07 -0600
- Reply-To: tromey at redhat dot com
I'm checking this in.
This re-merges some classes which we had merged with Classpath but
which got out of sync. There are more of these (notably most of
java.security), but I'm done doing this for the time being. I do plan
to periodically re-run my script so I can keep on top of divergence.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* java/io/BufferedReader.java, java/io/ObjectInput.java,
java/io/ObjectInputValidation.java, java/io/ObjectOutput.java:
Re-merged with Classpath.
Index: java/io/BufferedReader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/BufferedReader.java,v
retrieving revision 1.7
diff -u -r1.7 BufferedReader.java
--- java/io/BufferedReader.java 2001/08/31 05:00:12 1.7
+++ java/io/BufferedReader.java 2001/09/01 00:57:48
@@ -72,6 +72,8 @@
guaranteed to be >= the read-limit requested in the call to mark. */
int markPos = -1;
+ // The JCL book specifies the default buffer size as 8K characters.
+ // This is package-private because it is used by LineNumberReader.
static final int DEFAULT_BUFFER_SIZE = 8192;
/**
Index: java/io/Externalizable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/Externalizable.java,v
retrieving revision 1.1
diff -u -r1.1 Externalizable.java
--- java/io/Externalizable.java 2000/05/19 17:55:31 1.1
+++ java/io/Externalizable.java 2001/09/01 00:57:48
@@ -49,7 +49,7 @@
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
-public abstract interface Externalizable extends Serializable
+public interface Externalizable extends Serializable
{
/**
Index: java/io/ObjectInput.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/ObjectInput.java,v
retrieving revision 1.1
diff -u -r1.1 ObjectInput.java
--- java/io/ObjectInput.java 2000/05/19 17:55:31 1.1
+++ java/io/ObjectInput.java 2001/09/01 00:57:48
@@ -37,7 +37,7 @@
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
-public abstract interface ObjectInput extends DataInput
+public interface ObjectInput extends DataInput
{
/**
Index: java/io/ObjectInputValidation.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/ObjectInputValidation.java,v
retrieving revision 1.1
diff -u -r1.1 ObjectInputValidation.java
--- java/io/ObjectInputValidation.java 2000/05/19 17:55:31 1.1
+++ java/io/ObjectInputValidation.java 2001/09/01 00:57:48
@@ -34,7 +34,7 @@
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
-public abstract interface ObjectInputValidation
+public interface ObjectInputValidation
{
/**
Index: java/io/ObjectOutput.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/ObjectOutput.java,v
retrieving revision 1.1
diff -u -r1.1 ObjectOutput.java
--- java/io/ObjectOutput.java 2000/05/19 17:55:31 1.1
+++ java/io/ObjectOutput.java 2001/09/01 00:57:48
@@ -36,7 +36,7 @@
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
-public abstract interface ObjectOutput extends DataOutput
+public interface ObjectOutput extends DataOutput
{