Index: java/io/BufferedReader.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/BufferedReader.java,v retrieving revision 1.19 diff -u -r1.19 BufferedReader.java --- java/io/BufferedReader.java 5 May 2004 08:24:13 -0000 1.19 +++ java/io/BufferedReader.java 16 Nov 2004 11:01:49 -0000 @@ -508,7 +508,7 @@ * skip method on the underlying stream to skip the * remaining chars. * - * @param numChars The requested number of chars to skip + * @param count The requested number of chars to skip * * @return The actual number of chars skipped. * Index: java/io/FileInputStream.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/FileInputStream.java,v retrieving revision 1.21 diff -u -r1.21 FileInputStream.java --- java/io/FileInputStream.java 9 Oct 2004 10:22:24 -0000 1.21 +++ java/io/FileInputStream.java 16 Nov 2004 11:01:49 -0000 @@ -122,7 +122,7 @@ * An exception is * thrown if reading is not allowed. * - * @param fd The FileDescriptor object this stream + * @param fdObj The FileDescriptor object this stream * should read from * * @exception SecurityException If read access to the file is not allowed Index: java/io/FileOutputStream.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/FileOutputStream.java,v retrieving revision 1.18 diff -u -r1.18 FileOutputStream.java --- java/io/FileOutputStream.java 9 Oct 2004 10:22:24 -0000 1.18 +++ java/io/FileOutputStream.java 16 Nov 2004 11:01:49 -0000 @@ -72,7 +72,7 @@ * one exists) with the name of the file to be opened. An exception is * thrown if writing is not allowed. * - * @param name The name of the file this stream should write to + * @param path The name of the file this stream should write to * @param append true to append bytes to the end of the file, * or false to write bytes to the beginning * @@ -95,7 +95,7 @@ * one exists) with the name of the file to be opened. An exception is * thrown if writing is not allowed. * - * @param name The name of the file this stream should write to + * @param path The name of the file this stream should write to * * @exception SecurityException If write access to the file is not allowed * @exception FileNotFoundException If a non-security error occurs @@ -176,7 +176,7 @@ * one exists) with the specified FileDescriptor as an argument. * An exception is thrown if writing is not allowed. * - * @param file The FileDescriptor this stream should write to + * @param fdObj The FileDescriptor this stream should write to * * @exception SecurityException If write access to the file is not allowed */ Index: java/io/FileWriter.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/FileWriter.java,v retrieving revision 1.8 diff -u -r1.8 FileWriter.java --- java/io/FileWriter.java 23 Mar 2003 19:11:19 -0000 1.8 +++ java/io/FileWriter.java 16 Nov 2004 11:01:49 -0000 @@ -1,5 +1,5 @@ /* FileWriter.java -- Convenience class for writing to files. - Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,96 +49,89 @@ * OutputStreamWriter to write to it. * * @author Aaron M. Renn (address@hidden) - * @author Tom Tromey + * @author Tom Tromey (address@hidden) */ public class FileWriter extends OutputStreamWriter { - - /* - * Constructors - */ - /** - * This method initializes a new FileWriter object to write - * to the specified File object. - * - * @param file The File object to write to. - * - * @param SecurityException If writing to this file is forbidden by the - * SecurityManager. - * @param IOException If any other error occurs - */ + * This method initializes a new FileWriter object to write + * to the specified File object. + * + * @param file The File object to write to. + * + * @throws SecurityException If writing to this file is forbidden by the + * SecurityManager. + * @throws IOException If any other error occurs + */ public FileWriter(File file) throws SecurityException, IOException { super(new FileOutputStream(file)); } /** - * This method initializes a new FileWriter object to write - * to the specified File object. - * - * @param file The File object to write to. - * @param append true to start adding data at the end of the - * file, false otherwise. - * - * @param SecurityException If writing to this file is forbidden by the - * SecurityManager. - * @param IOException If any other error occurs - */ + * This method initializes a new FileWriter object to write + * to the specified File object. + * + * @param file The File object to write to. + * @param append true to start adding data at the end of the + * file, false otherwise. + * + * @throws SecurityException If writing to this file is forbidden by the + * SecurityManager. + * @throws IOException If any other error occurs + */ public FileWriter(File file, boolean append) throws IOException { super(new FileOutputStream(file, append)); } /** - * This method initializes a new FileWriter object to write - * to the specified FileDescriptor object. - * - * @param fd The FileDescriptor object to write to - * - * @param SecurityException If writing to this file is forbidden by the - * SecurityManager. - */ + * This method initializes a new FileWriter object to write + * to the specified FileDescriptor object. + * + * @param fd The FileDescriptor object to write to + * + * @throws SecurityException If writing to this file is forbidden by the + * SecurityManager. + */ public FileWriter(FileDescriptor fd) throws SecurityException { super(new FileOutputStream(fd)); } /** - * This method intializes a new FileWriter object to - * write to the - * specified named file. - * - * @param name The name of the file to write to - * - * @param SecurityException If writing to this file is forbidden by the - * SecurityManager. - * @param IOException If any other error occurs - */ + * This method intializes a new FileWriter object to + * write to the + * specified named file. + * + * @param name The name of the file to write to + * + * @throws SecurityException If writing to this file is forbidden by the + * SecurityManager. + * @throws IOException If any other error occurs + */ public FileWriter(String name) throws IOException { super(new FileOutputStream(name)); } /** - * This method intializes a new FileWriter object to - * write to the - * specified named file. This form of the constructor allows the caller - * to determin whether data should be written starting at the beginning or - * the end of the file. - * - * @param name The name of the file to write to - * @param append true to start adding data at the end of the - * file, false otherwise. - * - * @param SecurityException If writing to this file is forbidden by the - * SecurityManager. - * @param IOException If any other error occurs - */ + * This method intializes a new FileWriter object to + * write to the + * specified named file. This form of the constructor allows the caller + * to determin whether data should be written starting at the beginning or + * the end of the file. + * + * @param name The name of the file to write to + * @param append true to start adding data at the end of the + * file, false otherwise. + * + * @throws SecurityException If writing to this file is forbidden by the + * SecurityManager. + * @throws IOException If any other error occurs + */ public FileWriter(String name, boolean append) throws IOException { super(new FileOutputStream(name, append)); } - -} // class FileWriter - +} Index: java/io/OutputStreamWriter.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/OutputStreamWriter.java,v retrieving revision 1.16 diff -u -r1.16 OutputStreamWriter.java --- java/io/OutputStreamWriter.java 7 Jun 2003 18:35:00 -0000 1.16 +++ java/io/OutputStreamWriter.java 16 Nov 2004 11:01:49 -0000 @@ -287,7 +287,7 @@ /** * This method writes a single character to the output stream. * - * @param c The char to write, passed as an int. + * @param ch The char to write, passed as an int. * * @exception IOException If an error occurs */ Index: java/io/PipedInputStream.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/PipedInputStream.java,v retrieving revision 1.15 diff -u -r1.15 PipedInputStream.java --- java/io/PipedInputStream.java 9 Oct 2004 10:22:25 -0000 1.15 +++ java/io/PipedInputStream.java 16 Nov 2004 11:01:49 -0000 @@ -151,14 +151,14 @@ * This method receives a byte of input from the source PipedOutputStream. * If the internal circular buffer is full, this method blocks. * - * @param byte_received The byte to write to this stream + * @param val The byte to write to this stream * * @exception IOException if error occurs * @specnote Weird. This method must be some sort of accident. */ - protected synchronized void receive(int b) throws IOException + protected synchronized void receive(int val) throws IOException { - read_buf[0] = (byte) (b & 0xff); + read_buf[0] = (byte) (val & 0xff); receive (read_buf, 0, 1); } @@ -237,11 +237,7 @@ * because the end of the stream was reached. If the stream is already * closed, a -1 will again be returned to indicate the end of the stream. *

- * This method will block if no bytes are available to be read. - * - * @param buf The buffer into which bytes will be stored - * @param offset The index into the buffer at which to start writing. - * @param len The maximum number of bytes to read. + * This method will block if no byte is available to be read. */ public int read() throws IOException { @@ -252,11 +248,7 @@ // if this method is never called. int r = read(read_buf, 0, 1); - - if (r == -1) - return -1; - else - return read_buf[0]; + return r != -1 ? read_buf[0] : -1; } /** Index: java/io/PipedOutputStream.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/PipedOutputStream.java,v retrieving revision 1.10 diff -u -r1.10 PipedOutputStream.java --- java/io/PipedOutputStream.java 4 Feb 2003 21:07:15 -0000 1.10 +++ java/io/PipedOutputStream.java 16 Nov 2004 11:01:49 -0000 @@ -129,21 +129,21 @@ * PipedInputStream to which this object is connected has * a buffer that cannot hold all of the bytes to be written. * - * @param buf The array containing bytes to write to the stream. + * @param buffer The array containing bytes to write to the stream. * @param offset The index into the array to start writing bytes from. * @param len The number of bytes to write. * * @exception IOException If the stream has not been connected or has * been closed. */ - public void write(byte[] b, int off, int len) throws IOException + public void write(byte[] buffer, int offset, int len) throws IOException { if (sink == null) throw new IOException ("Not connected"); if (closed) throw new IOException ("Pipe closed"); - sink.receive (b, off, len); + sink.receive(buffer, offset, len); } /** Index: java/io/PipedReader.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/PipedReader.java,v retrieving revision 1.13 diff -u -r1.13 PipedReader.java --- java/io/PipedReader.java 20 Apr 2004 11:37:41 -0000 1.13 +++ java/io/PipedReader.java 16 Nov 2004 11:01:49 -0000 @@ -123,7 +123,7 @@ * This stream is then ready for reading. If this stream is already * connected or has been previously closed, then an exception is thrown * - * @param src The PipedWriter to connect this stream to + * @param source The PipedWriter to connect this stream to * * @exception IOException If this PipedReader or source * has been connected already. @@ -218,11 +218,7 @@ * because the end of the stream was reached. If the stream is already * closed, a -1 will again be returned to indicate the end of the stream. *

- * This method will block if no chars are available to be read. - * - * @param buf The buffer into which chars will be stored - * @param offset The index into the buffer at which to start writing. - * @param len The maximum number of chars to read. + * This method will block if no char is available to be read. */ public int read() throws IOException { @@ -233,11 +229,7 @@ // if this method is never called. int r = read(read_buf, 0, 1); - - if (r == -1) - return -1; - else - return read_buf[0]; + return r != -1 ? read_buf[0] : -1; } /** Index: java/io/PipedWriter.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/PipedWriter.java,v retrieving revision 1.10 diff -u -r1.10 PipedWriter.java --- java/io/PipedWriter.java 4 Feb 2003 21:07:15 -0000 1.10 +++ java/io/PipedWriter.java 16 Nov 2004 11:01:49 -0000 @@ -128,21 +128,21 @@ * PipedReader to which this object is connected has * a buffer that cannot hold all of the chars to be written. * - * @param buf The array containing chars to write to the stream. + * @param buffer The array containing chars to write to the stream. * @param offset The index into the array to start writing chars from. * @param len The number of chars to write. * * @exception IOException If the stream has not been connected or has * been closed. */ - public void write(char[] b, int off, int len) throws IOException + public void write(char[] buffer, int offset, int len) throws IOException { if (sink == null) throw new IOException ("Not connected"); if (closed) throw new IOException ("Pipe closed"); - sink.receive (b, off, len); + sink.receive(buffer, offset, len); } /** Index: java/io/PrintStream.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/PrintStream.java,v retrieving revision 1.24 diff -u -r1.24 PrintStream.java --- java/io/PrintStream.java 8 Dec 2003 12:45:59 -0000 1.24 +++ java/io/PrintStream.java 16 Nov 2004 11:01:49 -0000 @@ -279,7 +279,7 @@ * values are printed as "true" and false values are printed * as "false". * - * @param b The boolean value to print + * @param bool The boolean value to print */ public void print (boolean bool) { @@ -369,7 +369,7 @@ * This method prints an array of characters to the stream. The actual * value printed depends on the system default encoding. * - * @param s The array of characters to print. + * @param charArray The array of characters to print. */ public void print (char[] charArray) { @@ -393,7 +393,7 @@ *

* This method prints a line termination sequence after printing the value. * - * @param b The boolean value to print + * @param bool The boolean value to print */ public void println (boolean bool) { @@ -499,7 +499,7 @@ *

* This method prints a line termination sequence after printing the value. * - * @param s The array of characters to print. + * @param charArray The array of characters to print. */ public void println (char[] charArray) { @@ -511,7 +511,7 @@ * enabled, printing a newline character will cause the stream to be * flushed after the character is written. * - * @param b The byte to be written + * @param oneByte The byte to be written */ public void write (int oneByte) { Index: java/io/PushbackInputStream.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/PushbackInputStream.java,v retrieving revision 1.10 diff -u -r1.10 PushbackInputStream.java --- java/io/PushbackInputStream.java 20 Apr 2004 11:37:41 -0000 1.10 +++ java/io/PushbackInputStream.java 16 Nov 2004 11:01:49 -0000 @@ -302,7 +302,7 @@ * skip method on the underlying InputStream to * skip additional bytes if necessary. * - * @param numBytes The requested number of bytes to skip + * @param n The requested number of bytes to skip * * @return The actual number of bytes skipped. * Index: java/io/RandomAccessFile.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/RandomAccessFile.java,v retrieving revision 1.21 diff -u -r1.21 RandomAccessFile.java --- java/io/RandomAccessFile.java 9 Oct 2004 10:22:25 -0000 1.21 +++ java/io/RandomAccessFile.java 16 Nov 2004 11:01:49 -0000 @@ -205,7 +205,7 @@ *

* The file must be open for write access for this operation to succeed. * - * @param newlen The new length of the file + * @param newLen The new length of the file * * @exception IOException If an error occurs */ @@ -256,7 +256,7 @@ * bytes are stored starting at the beginning of the array and up to * buf.length bytes can be read. * - * @param buf The buffer to read bytes from the file into + * @param buffer The buffer to read bytes from the file into * * @return The actual number of bytes read or -1 if end of file * @@ -271,7 +271,7 @@ * This methods reads up to len bytes from the file into the * specified array starting at position offset into the array. * - * @param buf The array to read the bytes into + * @param buffer The array to read the bytes into * @param offset The index into the array to start storing bytes * @param len The requested number of bytes to read * @@ -414,7 +414,7 @@ * throws an exception if there is not enough data left in the stream to * fill the buffer * - * @param buf The buffer into which to read the data + * @param buffer The buffer into which to read the data * * @exception EOFException If end of file is reached before filling the * buffer @@ -434,9 +434,9 @@ * available and throws an exception if there is not enough data left in * the stream to read len bytes. * - * @param buf The buffer into which to read the data + * @param buffer The buffer into which to read the data * @param offset The offset into the buffer to start storing data - * @param len The number of bytes to read into the buffer + * @param count The number of bytes to read into the buffer * * @exception EOFException If end of file is reached before filling * the buffer @@ -460,8 +460,8 @@ * four bytes read from the stream, they will be * transformed to an int in the following manner: *

- * (int)(((byte1 & 0xFF) << 24) + ((byte2 & 0xFF) << 16) + - * ((byte3 & 0xFF) << 8) + (byte4 & 0xFF))) + * (int)(((byte1 & 0xFF) << 24) + ((byte2 & 0xFF) << 16) + + * ((byte3 & 0xFF) << 8) + (byte4 & 0xFF))) *

* The value returned is in the range of 0 to 65535. *

@@ -524,10 +524,10 @@ * transformed to an long in the following manner: *

* - * (long)((((long)byte1 & 0xFF) << 56) + (((long)byte2 & 0xFF) << 48) + - * (((long)byte3 & 0xFF) << 40) + (((long)byte4 & 0xFF) << 32) + - * (((long)byte5 & 0xFF) << 24) + (((long)byte6 & 0xFF) << 16) + - * (((long)byte7 & 0xFF) << 8) + ((long)byte9 & 0xFF))) + * (long)((((long)byte1 & 0xFF) << 56) + (((long)byte2 & 0xFF) << 48) + + * (((long)byte3 & 0xFF) << 40) + (((long)byte4 & 0xFF) << 32) + + * (((long)byte5 & 0xFF) << 24) + (((long)byte6 & 0xFF) << 16) + + * (((long)byte7 & 0xFF) << 8) + ((long)byte9 & 0xFF))) *

* The value returned is in the range of 0 to 65535. *

@@ -612,7 +612,7 @@ * and second byte read from the stream respectively, they will be * transformed to an int in the following manner: *

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

* The value returned is in the range of 0 to 65535. *

@@ -756,7 +756,7 @@ * This method writes a single byte of data to the file. The file must * be open for read-write in order for this operation to succeed. * - * @param The byte of data to write, passed as an int. + * @param oneByte The byte of data to write, passed as an int. * * @exception IOException If an error occurs */ @@ -769,7 +769,7 @@ * This method writes all the bytes in the specified array to the file. * The file must be open read-write in order for this operation to succeed. * - * @param buf The array of bytes to write to the file + * @param buffer The array of bytes to write to the file */ public void write (byte[] buffer) throws IOException { @@ -780,7 +780,7 @@ * This method writes len bytes to the file from the specified * array starting at index offset into the array. * - * @param buf The array of bytes to write to the file + * @param buffer The array of bytes to write to the file * @param offset The index into the array to start writing file * @param len The number of bytes to write * @@ -796,7 +796,7 @@ * stream. For a value of true, 1 is written to the stream. * For a value of false, 0 is written. * - * @param b The boolean value to write to the stream + * @param val The boolean value to write to the stream * * @exception IOException If an error occurs */ @@ -809,68 +809,68 @@ * This method writes a Java byte value to the underlying * output stream. * - * @param b The byte to write to the stream, passed + * @param val The byte to write to the stream, passed * as an int. * * @exception IOException If an error occurs */ - public final void writeByte (int v) throws IOException + public final void writeByte (int val) throws IOException { - out.writeByte(v); + out.writeByte(val); } /** * This method writes a Java short to the stream, high byte * first. This method requires two bytes to encode the value. * - * @param s The short value to write to the stream, + * @param val The short value to write to the stream, * passed as an int. * * @exception IOException If an error occurs */ - public final void writeShort (int v) throws IOException + public final void writeShort (int val) throws IOException { - out.writeShort(v); + out.writeShort(val); } /** * This method writes a single char value to the stream, * high byte first. * - * @param v The char value to write, passed as + * @param val The char value to write, passed as * an int. * * @exception IOException If an error occurs */ - public final void writeChar (int v) throws IOException + public final void writeChar (int val) throws IOException { - out.writeChar(v); + out.writeChar(val); } /** * This method writes a Java int to the stream, high bytes * first. This method requires four bytes to encode the value. * - * @param v The int value to write to the stream. + * @param val The int value to write to the stream. * * @exception IOException If an error occurs */ - public final void writeInt (int v) throws IOException + public final void writeInt (int val) throws IOException { - out.writeInt(v); + out.writeInt(val); } /** * This method writes a Java long to the stream, high bytes * first. This method requires eight bytes to encode the value. * - * @param v The long value to write to the stream. + * @param val The long value to write to the stream. * * @exception IOException If an error occurs */ - public final void writeLong (long v) throws IOException + public final void writeLong (long val) throws IOException { - out.writeLong(v); + out.writeLong(val); } /** @@ -881,15 +881,15 @@ * then writing this int value to the stream exactly the same * as the writeInt() method does. * - * @param v The floating point number to write to the stream. + * @param val The floating point number to write to the stream. * * @exception IOException If an error occurs * * @see #writeInt(int) */ - public final void writeFloat (float v) throws IOException + public final void writeFloat (float val) throws IOException { - out.writeFloat(v); + out.writeFloat(val); } /** @@ -900,16 +900,16 @@ * then writing this long value to the stream exactly the same * as the writeLong() method does. * - * @param v The double precision floating point number to write to the + * @param val The double precision floating point number to write to the * stream. * * @exception IOException If an error occurs * * @see #writeLong(long) */ - public final void writeDouble (double v) throws IOException + public final void writeDouble (double val) throws IOException { - out.writeDouble(v); + out.writeDouble(val); } /** @@ -917,13 +917,13 @@ * stream. One byte is written for each character in the String. * The high eight bits of each character are discarded. * - * @param s The String to write to the stream + * @param val The String to write to the stream * * @exception IOException If an error occurs */ - public final void writeBytes (String s) throws IOException + public final void writeBytes (String val) throws IOException { - out.writeBytes(s); + out.writeBytes(val); } /** @@ -931,13 +931,13 @@ * stream. There will be two bytes for each character value. The high * byte of the character will be written first. * - * @param s The String to write to the stream. + * @param val The String to write to the stream. * * @exception IOException If an error occurs */ - public final void writeChars (String s) throws IOException + public final void writeChars (String val) throws IOException { - out.writeChars(s); + out.writeChars(val); } /** @@ -965,13 +965,13 @@ * character value are stored in bits 0-5 of byte three, with the high bits * of that byte set to "10". * - * @param s The String to write to the output in UTF format + * @param val The String to write to the output in UTF format * * @exception IOException If an error occurs */ - public final void writeUTF (String s) throws IOException + public final void writeUTF (String val) throws IOException { - out.writeUTF(s); + out.writeUTF(val); } /** @@ -984,6 +984,4 @@ { return ch; } - -} // class RandomAccessFile - +} Index: java/io/Reader.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/Reader.java,v retrieving revision 1.7 diff -u -r1.7 Reader.java --- java/io/Reader.java 18 Mar 2003 06:00:25 -0000 1.7 +++ java/io/Reader.java 16 Nov 2004 11:01:50 -0000 @@ -103,7 +103,7 @@ * * @param buf The array into which the chars read should be stored * @param offset The offset into the array to start storing chars - * @param len The requested number of chars to read + * @param count The requested number of chars to read * * @return The actual number of chars read, or -1 if end of stream. * @@ -189,7 +189,7 @@ * reset() method is called, then the mark is invalid and the * stream object instance is not required to remember the mark. * - * @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 such as mark not being @@ -243,7 +243,7 @@ * override this method to provide a more efficient implementation where * one exists. * - * @param num_chars The requested number of chars to skip + * @param count The requested number of chars to skip * * @return The actual number of chars skipped. * Index: java/io/StreamTokenizer.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/StreamTokenizer.java,v retrieving revision 1.15 diff -u -r1.15 StreamTokenizer.java --- java/io/StreamTokenizer.java 20 Apr 2004 11:37:41 -0000 1.15 +++ java/io/StreamTokenizer.java 16 Nov 2004 11:01:50 -0000 @@ -122,7 +122,7 @@ * them. For details on how this method operates by default, see * StreamTokenizer(Reader). * - * @param in The InputStream to read from + * @param is The InputStream to read from * * @deprecated Since JDK 1.1. */ @@ -150,7 +150,7 @@ *

  • C and C++ (//) comments are not recognized
    • * * - * @param in The Reader to read chars from + * @param r The Reader to read chars from */ public StreamTokenizer(Reader r) { @@ -170,7 +170,7 @@ * This method sets the comment attribute on the specified * character. Other attributes for the character are cleared. * - * @param c The character to set the comment attribute for, passed as an int + * @param ch The character to set the comment attribute for, passed as an int */ public void commentChar(int ch) { @@ -517,7 +517,7 @@ * quote, or comment) will be set on this character. This character will * parse as its own token. * - * @param c The character to make ordinary, passed as an int + * @param ch The character to make ordinary, passed as an int */ public void ordinaryChar(int ch) { @@ -533,9 +533,9 @@ * range parse as its own token. * * @param low The low end of the range of values to set the whitespace - * attribute for - * @param high The high end of the range of values to set the whitespace - * attribute for + * attribute for + * @param hi The high end of the range of values to set the whitespace + * attribute for */ public void ordinaryChars(int low, int hi) { @@ -575,7 +575,7 @@ * This method sets the quote attribute on the specified character. * Other attributes for the character are cleared. * - * @param c The character to set the quote attribute for, passed as an int. + * @param ch The character to set the quote attribute for, passed as an int. */ public void quoteChar(int ch) { @@ -670,9 +670,9 @@ * specified range, range terminators included. * * @param low The low end of the range of values to set the whitespace - * attribute for - * @param high The high end of the range of values to set the whitespace - * attribute for + * attribute for + * @param hi The high end of the range of values to set the whitespace + * attribute for */ public void whitespaceChars(int low, int hi) { @@ -692,9 +692,9 @@ * specified range, range terminators included. * * @param low The low end of the range of values to set the alphabetic - * attribute for - * @param high The high end of the range of values to set the alphabetic - * attribute for + * attribute for + * @param hi The high end of the range of values to set the alphabetic + * attribute for */ public void wordChars(int low, int hi) { Index: java/io/StringReader.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/io/StringReader.java,v retrieving revision 1.7 diff -u -r1.7 StringReader.java --- java/io/StringReader.java 18 Mar 2003 06:00:25 -0000 1.7 +++ java/io/StringReader.java 16 Nov 2004 11:01:50 -0000 @@ -52,7 +52,7 @@ * method rewinds the read pointer to the beginning of the String. * * @author Aaron M. Renn (address@hidden) - * @author Warren Levy + * @author Warren Levy (address@hidden) * @date October 19, 1998. */ public class StringReader extends Reader @@ -74,7 +74,7 @@ * passed in String. This stream will read from the beginning * to the end of the String. * - * @param s The String this stream will read from. + * @param buffer The String this stream will read from. */ public StringReader(String buffer) { @@ -185,7 +185,7 @@ * buffer, then only enough chars are skipped to position the stream at * the end of the buffer. The actual number of chars skipped is returned. * - * @param num_chars The requested number of chars to skip + * @param n The requested number of chars to skip * * @return The actual number of chars skipped. */ Index: java/net/NetworkInterface.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/net/NetworkInterface.java,v retrieving revision 1.12 diff -u -r1.12 NetworkInterface.java --- java/net/NetworkInterface.java 21 Oct 2004 21:00:06 -0000 1.12 +++ java/net/NetworkInterface.java 16 Nov 2004 11:01:50 -0000 @@ -1,5 +1,5 @@ /* NetworkInterface.java -- - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -85,14 +85,14 @@ } /** - * Returns all available addresses of the network interface + * Returns all available addresses of the network interface * - * If a @see SecurityManager is available all addresses are checked - * with @see SecurityManager::checkConnect() if they are available. - * Only InetAddresses are returned where the security manager - * doesn't throw an exception. + * If a @see SecurityManager is available all addresses are checked + * with @see SecurityManager::checkConnect() if they are available. + * Only InetAddresses are returned where the security manager + * doesn't throw an exception. * - * @return An enumeration of all addresses. + * @return An enumeration of all addresses. */ public Enumeration getInetAddresses() { @@ -122,9 +122,9 @@ } /** - * Returns the display name of the interface + * Returns the display name of the interface * - * @return The display name of the interface + * @return The display name of the interface */ public String getDisplayName() { @@ -160,12 +160,14 @@ } /** - * Return a network interface by its address + * Return a network interface by its address * - * @param addr The address of the interface to return + * @param addr The address of the interface to return * - * @exception SocketException If an error occurs - * @exception NullPointerException If the specified addess is null + * @return the interface, or null if none found + * + * @exception SocketException If an error occurs + * @exception NullPointerException If the specified addess is null */ public static NetworkInterface getByInetAddress(InetAddress addr) throws SocketException @@ -189,9 +191,11 @@ } /** - * Return an Enumeration of all available network interfaces + * Return an Enumeration of all available network interfaces * - * @exception SocketException If an error occurs + * @return all interfaces + * + * @exception SocketException If an error occurs */ public static Enumeration getNetworkInterfaces() throws SocketException { @@ -204,9 +208,11 @@ } /** - * Checks if the current instance is equal to obj + * Checks if the current instance is equal to obj * - * @param obj The object to compare with + * @param obj The object to compare with + * + * @return true if equal, false otherwise */ public boolean equals(Object obj) { @@ -219,7 +225,9 @@ } /** - * Returns the hashcode of the current instance + * Returns the hashcode of the current instance + * + * @return the hashcode */ public int hashCode() { @@ -228,7 +236,9 @@ } /** - * Returns a string representation of the interface + * Returns a string representation of the interface + * + * @return the string */ public String toString() { @@ -248,4 +258,4 @@ return result; } -} // class NetworkInterface +} Index: java/net/URLClassLoader.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/net/URLClassLoader.java,v retrieving revision 1.19 diff -u -r1.19 URLClassLoader.java --- java/net/URLClassLoader.java 6 Nov 2004 23:22:05 -0000 1.19 +++ java/net/URLClassLoader.java 16 Nov 2004 11:01:50 -0000 @@ -1097,6 +1097,8 @@ * @param urls the initial URLs used to resolve classes and * resources * + * @return the class loader + * * @exception SecurityException when the calling code does not have * permission to access the given URLs */ @@ -1115,6 +1117,8 @@ * resources * @param parent the parent class loader * + * @return the class loader + * * @exception SecurityException when the calling code does not have * permission to access the given URLs */ Index: java/nio/ByteOrder.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/nio/ByteOrder.java,v retrieving revision 1.6 diff -u -r1.6 ByteOrder.java --- java/nio/ByteOrder.java 16 Oct 2004 18:06:02 -0000 1.6 +++ java/nio/ByteOrder.java 16 Nov 2004 11:01:50 -0000 @@ -1,5 +1,5 @@ /* ByteOrder.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,16 +39,25 @@ package java.nio; /** - * @author Michael Koch + * @author Michael Koch (address@hidden) * @since 1.4 */ public final class ByteOrder { + /** + * Constant indicating big endian byte order. + */ public static final ByteOrder BIG_ENDIAN = new ByteOrder(); - public static final ByteOrder LITTLE_ENDIAN = new ByteOrder(); + + /** + * Constant indicating little endian byte order. + */ + public static final ByteOrder LITTLE_ENDIAN = new ByteOrder(); /** * Returns the native byte order of the platform currently running. + * + * @return the native byte order */ public static ByteOrder nativeOrder() { @@ -58,6 +67,8 @@ /** * Returns a string representation of the byte order. + * + * @return the string */ public String toString() { Index: java/nio/channels/Channel.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/nio/channels/Channel.java,v retrieving revision 1.3 diff -u -r1.3 Channel.java --- java/nio/channels/Channel.java 20 Apr 2004 15:27:37 -0000 1.3 +++ java/nio/channels/Channel.java 16 Nov 2004 11:01:50 -0000 @@ -1,5 +1,5 @@ /* Channel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,15 +35,18 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.nio.channels; import java.io.IOException; - public interface Channel { /** * Tells whether this channel is open or not + * + * @return trueif channel is open, + * false otherwise */ boolean isOpen();