Index: java/io/BufferedWriter.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/io/BufferedWriter.java,v retrieving revision 1.12 diff -u -r1.12 BufferedWriter.java --- java/io/BufferedWriter.java 7 Apr 2003 20:28:01 -0000 1.12 +++ java/io/BufferedWriter.java 8 Apr 2004 21:22:08 -0000 @@ -44,21 +44,44 @@ */ /** - * This class accumulates chars written in a buffer instead of immediately - * writing the data to the underlying output sink. The chars are instead - * as one large block when the buffer is filled, or when the stream is - * closed or explicitly flushed. This mode operation can provide a more - * efficient mechanism for writing versus doing numerous small unbuffered - * writes. - * - * @author Aaron M. Renn (address@hidden) - * @author Tom Tromey - * @date September 25, 1998 - */ - + * This class accumulates chars written in a buffer instead of immediately + * writing the data to the underlying output sink. The chars are instead + * as one large block when the buffer is filled, or when the stream is + * closed or explicitly flushed. This mode operation can provide a more + * efficient mechanism for writing versus doing numerous small unbuffered + * writes. + * + * @author Aaron M. Renn (address@hidden) + * @author Tom Tromey (address@hidden) + * @date September 25, 1998 + */ public class BufferedWriter extends Writer { /** + * This is the default buffer size + */ + private static final int DEFAULT_BUFFER_SIZE = 8192; + + /** + * This is the underlying Writer to which this object + * sends its output. + */ + private Writer out; + + /** + * This is the internal char array used for buffering output before + * writing it. + */ + char[] buffer; + + /** + * This is the number of chars that are currently in the buffer and + * are waiting to be written to the underlying stream. It always points to + * the index into the buffer where the next char of data will be stored + */ + int count; + + /** * This method initializes a new BufferedWriter instance * that will write to the specified subordinate Writer * and which will use a default buffer size of 8192 chars. @@ -78,18 +101,20 @@ * @param out The underlying Writer to write data to * @param size The size of the internal buffer */ - public BufferedWriter (Writer ox, int size) + public BufferedWriter (Writer out, int size) { - super (ox); - out = ox; - buffer = new char[size]; - count = 0; + super(out); + this.out = out; + this.buffer = new char[size]; + this.count = 0; } /** * This method flushes any remaining buffered chars then closes the * underlying output stream. Any further attempts to write to this stream * may throw an exception + * + * @exception IOException If an error occurs. */ public void close () throws IOException { @@ -138,7 +163,7 @@ * is filled as a result of this write request, it will be flushed to the * underlying output stream. * - * @param b The char of data to be written, passed as an int + * @param oneChar The char of data to be written, passed as an int * * @exception IOException If an error occurs */ @@ -226,7 +251,7 @@ } // This should only be called with the lock held. - private final void localFlush () throws IOException + private void localFlush () throws IOException { if (count > 0) { @@ -234,28 +259,4 @@ count = 0; } } - - /** - * This is the underlying Writer to which this object - * sends its output. - */ - private Writer out; - - /** - * This is the internal char array used for buffering output before - * writing it. - */ - char[] buffer; - - /** - * This is the number of chars that are currently in the buffer and - * are waiting to be written to the underlying stream. It always points to - * the index into the buffer where the next char of data will be stored - */ - int count; - - /** - * This is the default buffer size - */ - private static final int DEFAULT_BUFFER_SIZE = 8192; } Index: java/io/FilterInputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/io/FilterInputStream.java,v retrieving revision 1.8 diff -u -r1.8 FilterInputStream.java --- java/io/FilterInputStream.java 23 Mar 2003 10:53:30 -0000 1.8 +++ java/io/FilterInputStream.java 8 Apr 2004 21:22:08 -0000 @@ -104,7 +104,7 @@ */ public boolean markSupported() { - return(in.markSupported()); + return in.markSupported() ; } /** @@ -126,7 +126,7 @@ */ public int available() throws IOException { - return(in.available()); + return in.available() ; } /** @@ -138,9 +138,9 @@ * * @exception IOException If an error occurs */ - public long skip(long num_bytes) throws IOException + public long skip(long numBytes) throws IOException { - return(in.skip(num_bytes)); + return in.skip(numBytes); } /** @@ -152,7 +152,7 @@ */ public int read() throws IOException { - return(in.read()); + return in.read(); } /** @@ -170,7 +170,7 @@ */ public int read(byte[] buf) throws IOException { - return(read(buf, 0, buf.length)); + return read(buf, 0, buf.length); } /** @@ -186,7 +186,7 @@ */ public int read(byte[] buf, int offset, int len) throws IOException { - return(in.read(buf, offset, len)); + return in.read(buf, offset, len); } /** @@ -200,6 +200,4 @@ { in.close(); } - -} // class FilterInputStream - +} Index: java/io/ObjectInputStream.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/io/ObjectInputStream.java,v retrieving revision 1.39 diff -u -r1.39 ObjectInputStream.java --- java/io/ObjectInputStream.java 26 Feb 2004 07:53:15 -0000 1.39 +++ java/io/ObjectInputStream.java 8 Apr 2004 21:22:09 -0000 @@ -38,23 +38,19 @@ package java.io; +import gnu.classpath.Configuration; +import gnu.java.io.ObjectIdentityWrapper; + import java.lang.reflect.Array; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.Proxy; -import java.security.PrivilegedAction; -import java.security.AccessController; import java.util.Arrays; import java.util.Hashtable; import java.util.Vector; - -import gnu.java.io.ObjectIdentityWrapper; -import gnu.java.lang.reflect.TypeSignature; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; - -import gnu.classpath.Configuration; public class ObjectInputStream extends InputStream implements ObjectInput, ObjectStreamConstants