From: Tom Tromey Date: Sun, 20 Apr 2003 22:47:43 +0000 (+0000) Subject: BufferedReader.java, [...]: Imports from Classpath. X-Git-Tag: releases/gcc-3.4.0~7136 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bd417a700334135c711990366ffef1e2fc8630b;p=thirdparty%2Fgcc.git BufferedReader.java, [...]: Imports from Classpath. * java/io/BufferedReader.java, java/io/BufferedWriter.java, java/io/DataInput.java, java/io/DataOutput.java: Imports from Classpath. From-SVN: r65868 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 04a8937a40df..319e3fbf48e5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-04-20 Tom Tromey + + * java/io/BufferedReader.java, java/io/BufferedWriter.java, + java/io/DataInput.java, java/io/DataOutput.java: Imports from + Classpath. + 2003-04-19 Tom Tromey * java/sql/Date.java, java/sql/DriverManager.java, diff --git a/libjava/java/io/BufferedReader.java b/libjava/java/io/BufferedReader.java index df53765d0b08..eb2e2d29efe6 100644 --- a/libjava/java/io/BufferedReader.java +++ b/libjava/java/io/BufferedReader.java @@ -1,5 +1,6 @@ /* BufferedReader.java - Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +49,7 @@ package java.io; * underlying implementation to provide a possibly more efficient read * mechanism. It maintains the buffer and buffer state in instance * variables that are available to subclasses. The default buffer size - * of 512 chars can be overridden by the creator of the stream. + * of 8192 chars can be overridden by the creator of the stream. *

* This class also implements mark/reset functionality. It is capable * of remembering any number of input chars, to the limits of @@ -89,7 +90,7 @@ public class BufferedReader extends Reader /** * Create a new BufferedReader that will read from the - * specified subordinate stream with a default buffer size of 4096 chars. + * specified subordinate stream with a default buffer size of 8192 chars. * * @param in The subordinate stream to read from */ @@ -104,7 +105,7 @@ public class BufferedReader extends Reader * caller. * * @param in The subordinate stream to read from - * @param bufsize The buffer size to use + * @param size The buffer size to use */ public BufferedReader(Reader in, int size) { @@ -114,7 +115,8 @@ public class BufferedReader extends Reader } /** - * This method closes the stream + * This method closes the underlying stream and frees any associated + * resources. * * @exception IOException If an error occurs */ @@ -143,7 +145,7 @@ public class BufferedReader extends Reader /** * Mark a position in the input to which the stream can be * "reset" by calling the reset() method. The parameter - * readlimit is the number of chars that can be read from the + * readLimit is the number of chars that can be read from the * stream after setting the mark before the mark becomes invalid. For * example, if mark() is called with a read limit of 10, then * when 11 chars of data are read from the stream before the @@ -155,7 +157,7 @@ public class BufferedReader extends Reader * not dependent on the subordinate stream supporting mark/reset * functionality. * - * @param readlimit The number of chars that can be read before the mark + * @param readLimit The number of chars that can be read before the mark * becomes invalid * * @exception IOException If an error occurs @@ -240,7 +242,7 @@ public class BufferedReader extends Reader /** * This method determines whether or not a stream is ready to be read. If - * This method returns false then this stream could (but is + * this method returns false then this stream could (but is * not guaranteed to) block on the next read attempt. * * @return true if this stream is ready to be read, @@ -478,7 +480,7 @@ public class BufferedReader extends Reader * skip method on the underlying stream to skip the * remaining chars. * - * @param num_chars The requested number of chars to skip + * @param numChars The requested number of chars to skip * * @return The actual number of chars skipped. * diff --git a/libjava/java/io/BufferedWriter.java b/libjava/java/io/BufferedWriter.java index b7837843cd3f..b35ca6ea3903 100644 --- a/libjava/java/io/BufferedWriter.java +++ b/libjava/java/io/BufferedWriter.java @@ -61,7 +61,7 @@ public class BufferedWriter extends Writer /** * This method initializes a new BufferedWriter instance * that will write to the specified subordinate Writer - * and which will use a default buffer size of 512 chars. + * and which will use a default buffer size of 8192 chars. * * @param out The underlying Writer to write data to */ diff --git a/libjava/java/io/DataInput.java b/libjava/java/io/DataInput.java index 95f5a3ca352a..2d92006618a2 100644 --- a/libjava/java/io/DataInput.java +++ b/libjava/java/io/DataInput.java @@ -68,6 +68,8 @@ public interface DataInput * @exception EOFException If end of file is reached before * reading the boolean * @exception IOException If any other error occurs + * + * @see DataOutput#writeBoolean */ boolean readBoolean() throws EOFException, IOException; @@ -84,7 +86,7 @@ public interface DataInput * @exception EOFException If end of file is reached before reading the byte * @exception IOException If any other error occurs * - * @see DataOutput#writeBoolean + * @see DataOutput#writeByte */ byte readByte() throws EOFException, IOException; @@ -143,7 +145,7 @@ public interface DataInput * first and second byte read from the stream respectively, they will be * transformed to a short in the following manner: *

- * (short)((byte1 << 8) + (byte2 & 0xFF)) + * (short)(((byte1 & 0xFF) << 8) + (byte2 & 0xFF)) *

* The value returned is in the range of -32768 to 32767. *

@@ -234,7 +236,7 @@ public interface DataInput * (long)(((byte1 & 0xFF) << 56) + ((byte2 & 0xFF) << 48) + * ((byte3 & 0xFF) << 40) + ((byte4 & 0xFF) << 32) + * ((byte5 & 0xFF) << 24) + ((byte6 & 0xFF) << 16) + - * ((byte7 & 0xFF) << 8) + (byte9 & 0xFF))) + * ((byte7 & 0xFF) << 8) + (byte8 & 0xFF))) * *

* The value returned is in the range of -9223372036854775808 to @@ -316,14 +318,10 @@ public interface DataInput * charaters are discarded and are not returned as part of the string. * A line is also terminated by an end of file condition. *

- * This method can read data that was written by an object implementing the - * writeLine() method in DataOutput. * * @return The line read as a String * * @exception IOException If an error occurs - * - * @see DataOutput#writeLine */ String readLine() throws IOException; @@ -442,6 +440,7 @@ public interface DataInput * This method skips and discards the specified number of bytes in an * input stream. Note that this method may skip less than the requested * number of bytes. The actual number of bytes skipped is returned. + * No bytes are skipped if a negative number is passed to this method. * * @param numBytes The number of bytes to skip * diff --git a/libjava/java/io/DataOutput.java b/libjava/java/io/DataOutput.java index 462889d646d8..e07eb6289694 100644 --- a/libjava/java/io/DataOutput.java +++ b/libjava/java/io/DataOutput.java @@ -111,7 +111,7 @@ public interface DataOutput void writeChar(int value) throws IOException; /** - * This method writes a Java char value to an output stream. The + * This method writes a Java short value to an output stream. The * char to be written will be in the lowest 16 bits of the int * value passed. These bytes will be written "big endian". That is, * with the high byte written first in the following manner: @@ -236,7 +236,7 @@ public interface DataOutput void writeBytes(String value) throws IOException; /** - * This method writes all the bytes of a String to an + * This method writes all the characters of a String to an * output stream as an array of char's. Each character * is written using the method specified in the writeChar * method.