src/share/classes/java/io/LineNumberInputStream.java
Print this page
*** 1,7 ****
/*
! * Copyright (c) 1995, 2004, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
--- 1,7 ----
/*
! * 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
*** 28,44 ****
/**
* This class is an input stream filter that provides the added
* functionality of keeping track of the current line number.
* <p>
* A line is a sequence of bytes ending with a carriage return
! * character (<code>'\r'</code>), a newline character
! * (<code>'\n'</code>), 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.
* <p>
! * The line number begins at <code>0</code>, and is incremented by
! * <code>1</code> when a <code>read</code> returns a newline character.
*
* @author Arthur van Hoff
* @see java.io.LineNumberReader
* @since JDK1.0
* @deprecated This class incorrectly assumes that bytes adequately represent
--- 28,44 ----
/**
* This class is an input stream filter that provides the added
* functionality of keeping track of the current line number.
* <p>
* A line is a sequence of bytes ending with a carriage return
! * 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.
* <p>
! * 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
* @since JDK1.0
* @deprecated This class incorrectly assumes that bytes adequately represent
*** 64,89 ****
super(in);
}
/**
* Reads the next byte of data from this input stream. The value
! * byte is returned as an <code>int</code> in the range
! * <code>0</code> to <code>255</code>. If no byte is available
* because the end of the stream has been reached, the value
! * <code>-1</code> is returned. This method blocks until input data
* is available, the end of the stream is detected, or an exception
* is thrown.
* <p>
! * The <code>read</code> method of
! * <code>LineNumberInputStream</code> calls the <code>read</code>
* 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 <code>-1</code> if the end of this
* stream is reached.
* @exception IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
* @see java.io.LineNumberInputStream#getLineNumber()
*/
--- 64,89 ----
super(in);
}
/**
* Reads the next byte of data from this input stream. The value
! * 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
! * {@code -1} is returned. This method blocks until input data
* is available, the end of the stream is detected, or an exception
* is thrown.
* <p>
! * 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 {@code -1} if the end of this
* stream is reached.
* @exception IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
* @see java.io.LineNumberInputStream#getLineNumber()
*/
*** 109,130 ****
}
return c;
}
/**
! * Reads up to <code>len</code> bytes of data from this input stream
* into an array of bytes. This method blocks until some input is available.
* <p>
! * The <code>read</code> method of
! * <code>LineNumberInputStream</code> repeatedly calls the
! * <code>read</code> 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
! * <code>-1</code> 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()
*/
public int read(byte b[], int off, int len) throws IOException {
--- 109,130 ----
}
return c;
}
/**
! * 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.
* <p>
! * 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
! * {@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()
*/
public int read(byte b[], int off, int len) throws IOException {
*** 158,176 ****
}
return i;
}
/**
! * Skips over and discards <code>n</code> bytes of data from this
! * input stream. The <code>skip</code> method may, for a variety of
* reasons, end up skipping over some smaller number of bytes,
! * possibly <code>0</code>. The actual number of bytes skipped is
! * returned. If <code>n</code> is negative, no bytes are skipped.
* <p>
! * The <code>skip</code> method of <code>LineNumberInputStream</code> creates
* a byte array and then repeatedly reads into it until
! * <code>n</code> bytes have been read or the end of the stream has
* been reached.
*
* @param n the number of bytes to be skipped.
* @return the actual number of bytes skipped.
* @exception IOException if an I/O error occurs.
--- 158,176 ----
}
return i;
}
/**
! * 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 {@code 0}. The actual number of bytes skipped is
! * returned. If {@code n} is negative, no bytes are skipped.
* <p>
! * The {@code skip} method of {@code LineNumberInputStream} creates
* a byte array and then repeatedly reads into it until
! * {@code n} bytes have been read or the end of the stream has
* been reached.
*
* @param n the number of bytes to be skipped.
* @return the actual number of bytes skipped.
* @exception IOException if an I/O error occurs.
*** 223,238 ****
* Returns the number of bytes that can be read from this input
* stream without blocking.
* <p>
* Note that if the underlying input stream is able to supply
* <i>k</i> input characters without blocking, the
! * <code>LineNumberInputStream</code> can guarantee only to provide
* <i>k</i>/2 characters without blocking, because the
* <i>k</i> characters from the underlying input stream might
! * consist of <i>k</i>/2 pairs of <code>'\r'</code> and
! * <code>'\n'</code>, which are converted to just
! * <i>k</i>/2 <code>'\n'</code> characters.
*
* @return the number of bytes that can be read from this input stream
* without blocking.
* @exception IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
--- 223,238 ----
* Returns the number of bytes that can be read from this input
* stream without blocking.
* <p>
* Note that if the underlying input stream is able to supply
* <i>k</i> input characters without blocking, the
! * {@code LineNumberInputStream} can guarantee only to provide
* <i>k</i>/2 characters without blocking, because the
* <i>k</i> characters from the underlying input stream might
! * consist of <i>k</i>/2 pairs of {@code '\u005Cr'} and
! * {@code '\u005Cn'}, which are converted to just
! * <i>k</i>/2 {@code '\u005Cn'} characters.
*
* @return the number of bytes that can be read from this input stream
* without blocking.
* @exception IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
*** 241,256 ****
return (pushBack == -1) ? super.available()/2 : super.available()/2 + 1;
}
/**
* Marks the current position in this input stream. A subsequent
! * call to the <code>reset</code> method repositions this stream at
* the last marked position so that subsequent reads re-read the same bytes.
* <p>
! * The <code>mark</code> method of
! * <code>LineNumberInputStream</code> remembers the current line
! * number in a private variable, and then calls the <code>mark</code>
* method of the underlying input stream.
*
* @param readlimit the maximum limit of bytes that can be read before
* the mark position becomes invalid.
* @see java.io.FilterInputStream#in
--- 241,256 ----
return (pushBack == -1) ? super.available()/2 : super.available()/2 + 1;
}
/**
* Marks the current position in this input stream. A subsequent
! * call to the {@code reset} method repositions this stream at
* the last marked position so that subsequent reads re-read the same bytes.
* <p>
! * 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
* the mark position becomes invalid.
* @see java.io.FilterInputStream#in
*** 262,277 ****
in.mark(readlimit);
}
/**
* Repositions this stream to the position at the time the
! * <code>mark</code> method was last called on this input stream.
* <p>
! * The <code>reset</code> method of
! * <code>LineNumberInputStream</code> resets the line number to be
! * the line number at the time the <code>mark</code> method was
! * called, and then calls the <code>reset</code> method of the
* underlying input stream.
* <p>
* Stream marks are intended to be used in
* situations where you need to read ahead a little to see what's in
* the stream. Often this is most easily done by invoking some
--- 262,277 ----
in.mark(readlimit);
}
/**
* Repositions this stream to the position at the time the
! * {@code mark} method was last called on this input stream.
* <p>
! * 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.
* <p>
* Stream marks are intended to be used in
* situations where you need to read ahead a little to see what's in
* the stream. Often this is most easily done by invoking some