--- old/src/share/classes/java/io/LineNumberInputStream.java 2012-01-23 09:34:29.000000000 -0800 +++ new/src/share/classes/java/io/LineNumberInputStream.java 2012-01-23 09:34:29.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,13 +30,13 @@ * functionality of keeping track of the current line number. *

* A line is a sequence of bytes ending with a carriage return - * character ('\r'), a newline character - * ('\n'), or a carriage return character followed + * character ({@code '\u005Cr'}), a newline character + * ({@code '\u005Cn'}), or a carriage return character followed * immediately by a linefeed character. In all three cases, the line * terminating character(s) are returned as a single newline character. *

- * The line number begins at 0, and is incremented by - * 1 when a read returns a newline character. + * The line number begins at {@code 0}, and is incremented by + * {@code 1} when a {@code read} returns a newline character. * * @author Arthur van Hoff * @see java.io.LineNumberReader @@ -66,22 +66,22 @@ /** * Reads the next byte of data from this input stream. The value - * byte is returned as an int in the range - * 0 to 255. If no byte is available + * byte is returned as an {@code int} in the range + * {@code 0} to {@code 255}. If no byte is available * because the end of the stream has been reached, the value - * -1 is returned. This method blocks until input data + * {@code -1} is returned. This method blocks until input data * is available, the end of the stream is detected, or an exception * is thrown. *

- * The read method of - * LineNumberInputStream calls the read + * The {@code read} method of + * {@code LineNumberInputStream} calls the {@code read} * method of the underlying input stream. It checks for carriage * returns and newline characters in the input, and modifies the * current line number as appropriate. A carriage-return character or * a carriage return followed by a newline character are both * converted into a single newline character. * - * @return the next byte of data, or -1 if the end of this + * @return the next byte of data, or {@code -1} if the end of this * stream is reached. * @exception IOException if an I/O error occurs. * @see java.io.FilterInputStream#in @@ -111,18 +111,18 @@ } /** - * Reads up to len bytes of data from this input stream + * Reads up to {@code len} bytes of data from this input stream * into an array of bytes. This method blocks until some input is available. *

- * The read method of - * LineNumberInputStream repeatedly calls the - * read method of zero arguments to fill in the byte array. + * The {@code read} method of + * {@code LineNumberInputStream} repeatedly calls the + * {@code read} method of zero arguments to fill in the byte array. * * @param b the buffer into which the data is read. * @param off the start offset of the data. * @param len the maximum number of bytes read. * @return the total number of bytes read into the buffer, or - * -1 if there is no more data because the end of + * {@code -1} if there is no more data because the end of * this stream has been reached. * @exception IOException if an I/O error occurs. * @see java.io.LineNumberInputStream#read() @@ -160,15 +160,15 @@ } /** - * Skips over and discards n bytes of data from this - * input stream. The skip method may, for a variety of + * Skips over and discards {@code n} bytes of data from this + * input stream. The {@code skip} method may, for a variety of * reasons, end up skipping over some smaller number of bytes, - * possibly 0. The actual number of bytes skipped is - * returned. If n is negative, no bytes are skipped. + * possibly {@code 0}. The actual number of bytes skipped is + * returned. If {@code n} is negative, no bytes are skipped. *

- * The skip method of LineNumberInputStream creates + * The {@code skip} method of {@code LineNumberInputStream} creates * a byte array and then repeatedly reads into it until - * n bytes have been read or the end of the stream has + * {@code n} bytes have been read or the end of the stream has * been reached. * * @param n the number of bytes to be skipped. @@ -225,12 +225,12 @@ *

* Note that if the underlying input stream is able to supply * k input characters without blocking, the - * LineNumberInputStream can guarantee only to provide + * {@code LineNumberInputStream} can guarantee only to provide * k/2 characters without blocking, because the * k characters from the underlying input stream might - * consist of k/2 pairs of '\r' and - * '\n', which are converted to just - * k/2 '\n' characters. + * consist of k/2 pairs of {@code '\u005Cr'} and + * {@code '\u005Cn'}, which are converted to just + * k/2 {@code '\u005Cn'} characters. * * @return the number of bytes that can be read from this input stream * without blocking. @@ -243,12 +243,12 @@ /** * Marks the current position in this input stream. A subsequent - * call to the reset method repositions this stream at + * call to the {@code reset} method repositions this stream at * the last marked position so that subsequent reads re-read the same bytes. *

- * The mark method of - * LineNumberInputStream remembers the current line - * number in a private variable, and then calls the mark + * The {@code mark} method of + * {@code LineNumberInputStream} remembers the current line + * number in a private variable, and then calls the {@code mark} * method of the underlying input stream. * * @param readlimit the maximum limit of bytes that can be read before @@ -264,12 +264,12 @@ /** * Repositions this stream to the position at the time the - * mark method was last called on this input stream. + * {@code mark} method was last called on this input stream. *

- * The reset method of - * LineNumberInputStream resets the line number to be - * the line number at the time the mark method was - * called, and then calls the reset method of the + * The {@code reset} method of + * {@code LineNumberInputStream} resets the line number to be + * the line number at the time the {@code mark} method was + * called, and then calls the {@code reset} method of the * underlying input stream. *

* Stream marks are intended to be used in