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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 261aafa6f564f75785a9cf0d4c67a9b36b9590cd..103e32b6dcd46574effbfcd6cc8723d5688c9552 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-31  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.
+
        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 9db2e5ce72d848f653fb83fd464cafe1f8c324ff..148ad344839766c28dd1087fb6b87cd8d00f906f 100644 (file)
--- 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 045df8660e1678143ca20837d90a9f6b7aa4e0f8..a489301b35f5f3c41d7cdb478a97c6eec6ddb36b 100644 (file)
--- 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 ef23fa9034f4232b5d201c1b5c1f09224c72e9fe..03e1dac8c519d7487d79afa1ffdb0cb518016ae5 100644 (file)
--- 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 cf3508ec6b9a5067847110a594671fd070eea12c..cb2f9f275aa0ce80733613efa9dba5820aefb47a 100644 (file)
--- 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 56b339071092c0ef8aed893dd70bb81409a30ba2..83ccfb69ffdc083b9d41137d96c62af54104ce30 100644 (file)
--- 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
 {