From 788d7b942c6621c06f3d9f362aaa179dcd8fc811 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 1 Sep 2001 00:59:09 +0000 Subject: [PATCH] BufferedReader.java, [...]: Re-merged with Classpath. * java/io/BufferedReader.java, java/io/ObjectInput.java, java/io/ObjectInputValidation.java, java/io/ObjectOutput.java: Re-merged with Classpath. From-SVN: r45342 --- libjava/ChangeLog | 4 ++++ libjava/java/io/BufferedReader.java | 2 ++ libjava/java/io/Externalizable.java | 2 +- libjava/java/io/ObjectInput.java | 2 +- libjava/java/io/ObjectInputValidation.java | 2 +- libjava/java/io/ObjectOutput.java | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 261aafa6f56..103e32b6dcd 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,9 @@ 2001-08-31 Tom Tromey + * java/io/BufferedReader.java, java/io/ObjectInput.java, + java/io/ObjectInputValidation.java, java/io/ObjectOutput.java: + Re-merged with Classpath. + Re-merge with Classpath: * java/util/Comparator (equals): Added. * java/io/PipedWriter.java (write): Changed argument to `int'. diff --git a/libjava/java/io/BufferedReader.java b/libjava/java/io/BufferedReader.java index 9db2e5ce72d..148ad344839 100644 --- a/libjava/java/io/BufferedReader.java +++ b/libjava/java/io/BufferedReader.java @@ -72,6 +72,8 @@ public class BufferedReader extends Reader 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; /** diff --git a/libjava/java/io/Externalizable.java b/libjava/java/io/Externalizable.java index 045df8660e1..a489301b35f 100644 --- a/libjava/java/io/Externalizable.java +++ b/libjava/java/io/Externalizable.java @@ -49,7 +49,7 @@ package java.io; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public abstract interface Externalizable extends Serializable +public interface Externalizable extends Serializable { /** diff --git a/libjava/java/io/ObjectInput.java b/libjava/java/io/ObjectInput.java index ef23fa9034f..03e1dac8c51 100644 --- a/libjava/java/io/ObjectInput.java +++ b/libjava/java/io/ObjectInput.java @@ -37,7 +37,7 @@ package java.io; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public abstract interface ObjectInput extends DataInput +public interface ObjectInput extends DataInput { /** diff --git a/libjava/java/io/ObjectInputValidation.java b/libjava/java/io/ObjectInputValidation.java index cf3508ec6b9..cb2f9f275aa 100644 --- a/libjava/java/io/ObjectInputValidation.java +++ b/libjava/java/io/ObjectInputValidation.java @@ -34,7 +34,7 @@ package java.io; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public abstract interface ObjectInputValidation +public interface ObjectInputValidation { /** diff --git a/libjava/java/io/ObjectOutput.java b/libjava/java/io/ObjectOutput.java index 56b33907109..83ccfb69ffd 100644 --- a/libjava/java/io/ObjectOutput.java +++ b/libjava/java/io/ObjectOutput.java @@ -36,7 +36,7 @@ package java.io; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public abstract interface ObjectOutput extends DataOutput +public interface ObjectOutput extends DataOutput {