Commit 788d7b94 by Tom Tromey Committed by Tom Tromey

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
parent 898c7238
2001-08-31 Tom Tromey <tromey@redhat.com> 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: Re-merge with Classpath:
* java/util/Comparator (equals): Added. * java/util/Comparator (equals): Added.
* java/io/PipedWriter.java (write): Changed argument to `int'. * java/io/PipedWriter.java (write): Changed argument to `int'.
......
...@@ -72,6 +72,8 @@ public class BufferedReader extends Reader ...@@ -72,6 +72,8 @@ public class BufferedReader extends Reader
guaranteed to be >= the read-limit requested in the call to mark. */ guaranteed to be >= the read-limit requested in the call to mark. */
int markPos = -1; 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; static final int DEFAULT_BUFFER_SIZE = 8192;
/** /**
......
...@@ -49,7 +49,7 @@ package java.io; ...@@ -49,7 +49,7 @@ package java.io;
* *
* @author Aaron M. Renn (arenn@urbanophile.com) * @author Aaron M. Renn (arenn@urbanophile.com)
*/ */
public abstract interface Externalizable extends Serializable public interface Externalizable extends Serializable
{ {
/** /**
......
...@@ -37,7 +37,7 @@ package java.io; ...@@ -37,7 +37,7 @@ package java.io;
* *
* @author Aaron M. Renn (arenn@urbanophile.com) * @author Aaron M. Renn (arenn@urbanophile.com)
*/ */
public abstract interface ObjectInput extends DataInput public interface ObjectInput extends DataInput
{ {
/** /**
......
...@@ -34,7 +34,7 @@ package java.io; ...@@ -34,7 +34,7 @@ package java.io;
* *
* @author Aaron M. Renn (arenn@urbanophile.com) * @author Aaron M. Renn (arenn@urbanophile.com)
*/ */
public abstract interface ObjectInputValidation public interface ObjectInputValidation
{ {
/** /**
......
...@@ -36,7 +36,7 @@ package java.io; ...@@ -36,7 +36,7 @@ package java.io;
* *
* @author Aaron M. Renn (arenn@urbanophile.com) * @author Aaron M. Renn (arenn@urbanophile.com)
*/ */
public abstract interface ObjectOutput extends DataOutput public interface ObjectOutput extends DataOutput
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment