* java/io/BufferedOutputStream.java

        (close): Delete commented out method
        (finalize): Delete commented out method
        * java/io/BufferedReader.java
        * java/io/BufferedWriter.java

4 files changed, 20 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index b9aba48dc..32c99a1ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-04-07  Aaron M. Renn (arenn@urbanophile.com)
 
+	* java/io/BufferedOutputStream.java
+	(close): Delete commented out method
+	(finalize): Delete commented out method
+	* java/io/BufferedReader.java
+	* java/io/BufferedWriter.java
+
+2003-04-07  Aaron M. Renn (arenn@urbanophile.com)
+
 	* java/io/DataInputStream.java
 	Re-order methods to be more logical and consistent with DataInput
 	interface
diff --git a/java/io/BufferedOutputStream.java b/java/io/BufferedOutputStream.java
index 137dec549..008aad1e2 100644
--- a/java/io/BufferedOutputStream.java
+++ b/java/io/BufferedOutputStream.java
@@ -112,31 +112,6 @@ public class BufferedOutputStream extends FilterOutputStream
   }
 
   /**
-   * This method flushes any remaining buffered bytes then closes the 
-   * underlying output stream.  Any further attempts to write to this stream
-   * may throw an exception
-   *
-  public synchronized void close() throws IOException
-  {
-    flush();
-    out.close();
-  }
-  */
-
-  /**
-   * This method runs when the object is garbage collected.  It is 
-   * responsible for ensuring that all buffered bytes are written and
-   * for closing the underlying stream.
-   *
-   * @exception IOException If an error occurs (ignored by the Java runtime)
-   *
-  protected void finalize() throws IOException
-  {
-    close();
-  }
-  */
-
-  /**
    * This method writes a single byte of data.  This will be written to the
    * buffer instead of the underlying data source.  However, if the buffer
    * is filled as a result of this write request, it will be flushed to the
diff --git a/java/io/BufferedReader.java b/java/io/BufferedReader.java
index df53765d0..eb2e2d29e 100644
--- a/java/io/BufferedReader.java
+++ b/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.
  * <p>
  * 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 <code>BufferedReader</code> 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 <code>reset()</code> method.  The parameter
-   * <code>readlimit</code> is the number of chars that can be read from the 
+   * <code>readLimit</code> is the number of chars that can be read from the 
    * stream after setting the mark before the mark becomes invalid.  For
    * example, if <code>mark()</code> 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 <code>false</code> then this stream could (but is
+   * this method returns <code>false</code> then this stream could (but is
    * not guaranteed to) block on the next read attempt.
    *
    * @return <code>true</code> if this stream is ready to be read, 
@@ -478,7 +480,7 @@ public class BufferedReader extends Reader
    * <code>skip</code> 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/java/io/BufferedWriter.java b/java/io/BufferedWriter.java
index b7837843c..b35ca6ea3 100644
--- a/java/io/BufferedWriter.java
+++ b/java/io/BufferedWriter.java
@@ -61,7 +61,7 @@ public class BufferedWriter extends Writer
   /**
    * This method initializes a new <code>BufferedWriter</code> instance
    * that will write to the specified subordinate <code>Writer</code>
-   * 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 <code>Writer</code> to write data to
    */