OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Buffer.java, [...]: Fixed javadocs all over. 

2004-07-09  Dalibor Topic  <robilad@kaffe.org>

	* java/nio/Buffer.java,
	java/nio/ByteBuffer.java,
	java/nio/ByteBufferHelper.java,
	java/nio/ByteBufferImpl.java,
	java/nio/CharBuffer.java,
	java/nio/CharBufferImpl.java,
	java/nio/CharViewBufferImpl.java,
	java/nio/DirectByteBufferImpl.java,
	java/nio/DoubleBuffer.java,
	java/nio/DoubleBufferImpl.java,
	java/nio/DoubleViewBufferImpl.java,
	java/nio/FloatBuffer.java,
	java/nio/FloatBufferImpl.java,
	java/nio/FloatViewBufferImpl.java,
	java/nio/IntBuffer.java,
	java/nio/IntBufferImpl.java,
	java/nio/IntViewBufferImpl.java,
	java/nio/LongBuffer.java,
	java/nio/LongBufferImpl.java,
	java/nio/LongViewBufferImpl.java,
	java/nio/MappedByteBufferImpl.java,
	java/nio/ShortBuffer.java,
	java/nio/ShortBufferImpl.java,
	java/nio/ShortViewBufferImpl.java:
        Fixed javadocs all over. Improved input error
        checking.

	* java/nio/Buffer.java
	(checkForUnderflow, checkForOverflow, checkIndex,
	checkIfReadOnly, checkArraySize): New helper methods
        for error checking.

	* java/nio/ByteBufferHelper.java
	(checkRemainingForRead, checkRemainingForWrite,
	checkAvailableForRead, checkAvailableForWrite): Removed
        no longer needed methods.

From-SVN: r84366
This commit is contained in:
Dalibor Topic 2004-07-09 13:40:29 +00:00 committed by Michael Koch
parent e484d7d5b3
commit 23c41c0833
25 changed files with 558 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libjava/ChangeLog
View File

@ -1,3 +1,42 @@
2004-07-09 Dalibor Topic <robilad@kaffe.org>
* java/nio/Buffer.java,
java/nio/ByteBuffer.java,
java/nio/ByteBufferHelper.java,
java/nio/ByteBufferImpl.java,
java/nio/CharBuffer.java,
java/nio/CharBufferImpl.java,
java/nio/CharViewBufferImpl.java,
java/nio/DirectByteBufferImpl.java,
java/nio/DoubleBuffer.java,
java/nio/DoubleBufferImpl.java,
java/nio/DoubleViewBufferImpl.java,
java/nio/FloatBuffer.java,
java/nio/FloatBufferImpl.java,
java/nio/FloatViewBufferImpl.java,
java/nio/IntBuffer.java,
java/nio/IntBufferImpl.java,
java/nio/IntViewBufferImpl.java,
java/nio/LongBuffer.java,
java/nio/LongBufferImpl.java,
java/nio/LongViewBufferImpl.java,
java/nio/MappedByteBufferImpl.java,
java/nio/ShortBuffer.java,
java/nio/ShortBufferImpl.java,
java/nio/ShortViewBufferImpl.java:
Fixed javadocs all over. Improved input error
checking.
* java/nio/Buffer.java
(checkForUnderflow, checkForOverflow, checkIndex,
checkIfReadOnly, checkArraySize): New helper methods
for error checking.
* java/nio/ByteBufferHelper.java
(checkRemainingForRead, checkRemainingForWrite,
checkAvailableForRead, checkAvailableForWrite): Removed
no longer needed methods.
2004-07-09 Michael Koch <konqueror@gmx.de> 2004-07-09 Michael Koch <konqueror@gmx.de>
* gnu/regexp/CharIndexedInputStream.java: * gnu/regexp/CharIndexedInputStream.java:

113
libjava/java/nio/Buffer.java
View File

@ -233,7 +233,7 @@ public abstract class Buffer
* Rewinds this buffer. The position is set to zero and the mark * Rewinds this buffer. The position is set to zero and the mark
* is discarded. * is discarded.
* *
* @this buffer * @return this buffer
*/ */
public final Buffer rewind() public final Buffer rewind()
{ {
@ -241,4 +241,115 @@ public abstract class Buffer
mark = -1; mark = -1;
return this; return this;
} }
/**
* Checks for underflow. This method is used internally to check
* whether a buffer has enough elements left to satisfy a read
* request.
*
* @exception BufferUnderflowException If there are no remaining
* elements in this buffer.
*/
final void checkForUnderflow()
{
if (!hasRemaining())
throw new BufferUnderflowException();
}
/**
* Checks for underflow. This method is used internally to check
* whether a buffer has enough elements left to satisfy a read
* request for a given number of elements.
*
* @param length The length of a sequence of elements.
*
* @exception BufferUnderflowException If there are not enough
* remaining elements in this buffer.
*/
final void checkForUnderflow(int length)
{
if (remaining() < length)
throw new BufferUnderflowException();
}
/**
* Checks for overflow. This method is used internally to check
* whether a buffer has enough space left to satisfy a write
* request.
*
* @exception BufferOverflowException If there is no remaining
* space in this buffer.
*/
final void checkForOverflow()
{
if (!hasRemaining())
throw new BufferOverflowException();
}
/**
* Checks for overflow. This method is used internally to check
* whether a buffer has enough space left to satisfy a write
* request for a given number of elements.
*
* @param length The length of a sequence of elements.
*
* @exception BufferUnderflowException If there is not enough
* remaining space in this buffer.
*/
final void checkForOverflow(int length)
{
if (remaining() < length)
throw new BufferOverflowException();
}
/**
* Checks if index is negative or not smaller than the buffer's
* limit. This method is used internally to check whether
* an indexed request can be fulfilled.
*
* @param index The requested position in the buffer.
*
* @exception IndexOutOfBoundsException If index is negative or not smaller
* than the buffer's limit.
*/
final void checkIndex(int index)
{
if (index < 0
|| index >= limit ())
throw new IndexOutOfBoundsException ();
}
/**
* Checks if buffer is read-only. This method is used internally to
* check if elements can be put into a buffer.
*
* @exception ReadOnlyBufferException If this buffer is read-only.
*/
final void checkIfReadOnly()
{
if (isReadOnly())
throw new ReadOnlyBufferException ();
}
/**
* Checks whether an array is large enough to hold the given number of
* elements at the given offset. This method is used internally to
* check if an array is big enough.
*
* @param arraylength The length of the array.
* @param offset The offset within the array of the first byte to be read;
* must be non-negative and no larger than arraylength.
* @param length The number of bytes to be read from the given array;
* must be non-negative and no larger than arraylength - offset.
*
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
final static void checkArraySize(int arraylength, int offset, int length)
{
if ((offset < 0) ||
(length < 0) ||
(arraylength < length + offset))
throw new IndexOutOfBoundsException ();
}
} }

49
libjava/java/nio/ByteBuffer.java
View File

@ -100,8 +100,9 @@ public abstract class ByteBuffer extends Buffer
} }
/** /**
* This method transfers <code>bytes<code> from this buffer into the given * This method transfers <code>byte</code>s from this buffer into the given
* destination array. * destination array. Before the transfer, it checks if there are fewer than
* length <code>byte</code>s remaining in this buffer.
* *
* @param dst The destination array * @param dst The destination array
* @param offset The offset within the array of the first <code>byte</code> * @param offset The offset within the array of the first <code>byte</code>
@ -110,16 +111,14 @@ public abstract class ByteBuffer extends Buffer
* must be non-negative and no larger than dst.length - offset. * must be non-negative and no larger than dst.length - offset.
* *
* @exception BufferUnderflowException If there are fewer than length * @exception BufferUnderflowException If there are fewer than length
* <code>bytes</code> remaining in this buffer. * <code>byte</code>s remaining in this buffer.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold. * and length parameters do not hold.
*/ */
public ByteBuffer get (byte[] dst, int offset, int length) public ByteBuffer get (byte[] dst, int offset, int length)
{ {
if (offset < 0 || length < 0 || offset + length > dst.length) checkArraySize(dst.length, offset, length);
throw new IndexOutOfBoundsException (); checkForUnderflow(length);
if (length > remaining())
throw new BufferUnderflowException();
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
{ {
@ -130,13 +129,13 @@ public abstract class ByteBuffer extends Buffer
} }
/** /**
* This method transfers <code>bytes<code> from this buffer into the given * This method transfers <code>byte</code>s from this buffer into the given
* destination array. * destination array.
* *
* @param dst The byte array to write into. * @param dst The byte array to write into.
* *
* @exception BufferUnderflowException If there are fewer than dst.length * @exception BufferUnderflowException If there are fewer than dst.length
* <code>bytes</code> remaining in this buffer. * <code>byte</code>s remaining in this buffer.
*/ */
public ByteBuffer get (byte[] dst) public ByteBuffer get (byte[] dst)
{ {
@ -145,12 +144,13 @@ public abstract class ByteBuffer extends Buffer
/** /**
* Writes the content of the the <code>ByteBUFFER</code> src * Writes the content of the the <code>ByteBUFFER</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* <code>src.remaining()</code> space remaining in this buffer.
* *
* @param src The source data. * @param src The source data.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>bytes<code> in the source buffer. * buffer for the remaining <code>byte</code>s in the source buffer.
* @exception IllegalArgumentException If the source buffer is this buffer. * @exception IllegalArgumentException If the source buffer is this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
@ -159,8 +159,7 @@ public abstract class ByteBuffer extends Buffer
if (src == this) if (src == this)
throw new IllegalArgumentException (); throw new IllegalArgumentException ();
if (src.remaining () > remaining ()) checkForOverflow(src.remaining());
throw new BufferOverflowException ();
if (src.remaining () > 0) if (src.remaining () > 0)
{ {
@ -174,7 +173,8 @@ public abstract class ByteBuffer extends Buffer
/** /**
* Writes the content of the the <code>byte array</code> src * Writes the content of the the <code>byte array</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* length space remaining in this buffer.
* *
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* @param offset The offset within the array of the first byte to be read; * @param offset The offset within the array of the first byte to be read;
@ -183,18 +183,15 @@ public abstract class ByteBuffer extends Buffer
* must be non-negative and no larger than src.length - offset. * must be non-negative and no larger than src.length - offset.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>bytes<code> in the source array. * buffer for the remaining <code>byte</code>s in the source array.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold * and length parameters do not hold
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public ByteBuffer put (byte[] src, int offset, int length) public ByteBuffer put (byte[] src, int offset, int length)
{ {
if ((offset < 0) || checkArraySize(src.length, offset, length);
(offset > src.length) || checkForOverflow(length);
(length < 0) ||
(length > src.length - offset))
throw new IndexOutOfBoundsException ();
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
put (src [i]); put (src [i]);
@ -209,7 +206,7 @@ public abstract class ByteBuffer extends Buffer
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>bytes<code> in the source array. * buffer for the remaining <code>byte</code>s in the source array.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public final ByteBuffer put (byte[] src) public final ByteBuffer put (byte[] src)
@ -239,8 +236,7 @@ public abstract class ByteBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return backing_buffer; return backing_buffer;
} }
@ -257,8 +253,7 @@ public abstract class ByteBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return array_offset; return array_offset;
} }
@ -338,7 +333,7 @@ public abstract class ByteBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferUnderflowException If there are no remaining * @exception BufferUnderflowException If there are no remaining
* <code>bytes</code> in this buffer. * <code>byte</code>s in this buffer.
*/ */
public abstract byte get (); public abstract byte get ();
@ -347,7 +342,7 @@ public abstract class ByteBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferOverflowException If there no remaining * @exception BufferOverflowException If there no remaining
* <code>bytes</code> in this buffer. * <code>byte</code>s in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public abstract ByteBuffer put (byte b); public abstract ByteBuffer put (byte b);

50
libjava/java/nio/ByteBufferHelper.java
View File

@ -42,32 +42,6 @@ package java.nio;
*/ */
final class ByteBufferHelper final class ByteBufferHelper
{ {
private static void checkRemainingForRead (ByteBuffer buffer, int bytes)
{
if (buffer.remaining() < bytes)
throw new BufferUnderflowException();
}
private static void checkRemainingForWrite (ByteBuffer buffer, int bytes)
{
if (buffer.remaining() < bytes)
throw new BufferOverflowException();
}
private static void checkAvailableForRead (ByteBuffer buffer,
int index, int bytes)
{
if (buffer.limit() < (index + bytes))
throw new BufferUnderflowException();
}
private static void checkAvailableForWrite (ByteBuffer buffer,
int index, int bytes)
{
if (buffer.limit() < (index + bytes))
throw new BufferOverflowException();
}
public static char getChar (ByteBuffer buffer, ByteOrder order) public static char getChar (ByteBuffer buffer, ByteOrder order)
{ {
return (char) getShort (buffer, order); return (char) getShort (buffer, order);
@ -91,7 +65,7 @@ final class ByteBufferHelper
public static short getShort (ByteBuffer buffer, ByteOrder order) public static short getShort (ByteBuffer buffer, ByteOrder order)
{ {
checkRemainingForRead (buffer, 2); buffer.checkForUnderflow(2);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
@ -105,7 +79,7 @@ final class ByteBufferHelper
public static void putShort (ByteBuffer buffer, short value, ByteOrder order) public static void putShort (ByteBuffer buffer, short value, ByteOrder order)
{ {
checkRemainingForWrite (buffer, 2); buffer.checkForOverflow(2);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
@ -122,8 +96,6 @@ final class ByteBufferHelper
public static short getShort (ByteBuffer buffer, public static short getShort (ByteBuffer buffer,
int index, ByteOrder order) int index, ByteOrder order)
{ {
checkAvailableForRead (buffer, index, 2);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
return (short) ((buffer.get (index) & 0xff) return (short) ((buffer.get (index) & 0xff)
@ -137,8 +109,6 @@ final class ByteBufferHelper
public static void putShort (ByteBuffer buffer, int index, public static void putShort (ByteBuffer buffer, int index,
short value, ByteOrder order) short value, ByteOrder order)
{ {
checkAvailableForWrite (buffer, index, 2);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
buffer.put (index, (byte) value); buffer.put (index, (byte) value);
@ -153,7 +123,7 @@ final class ByteBufferHelper
public static int getInt (ByteBuffer buffer, ByteOrder order) public static int getInt (ByteBuffer buffer, ByteOrder order)
{ {
checkRemainingForRead (buffer, 4); buffer.checkForUnderflow(4);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
@ -171,7 +141,7 @@ final class ByteBufferHelper
public static void putInt (ByteBuffer buffer, int value, ByteOrder order) public static void putInt (ByteBuffer buffer, int value, ByteOrder order)
{ {
checkRemainingForWrite (buffer, 4); buffer.checkForOverflow(4);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
@ -191,8 +161,6 @@ final class ByteBufferHelper
public static int getInt (ByteBuffer buffer, int index, ByteOrder order) public static int getInt (ByteBuffer buffer, int index, ByteOrder order)
{ {
checkAvailableForRead (buffer, index, 4);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
return ((buffer.get (index) & 0xff) return ((buffer.get (index) & 0xff)
@ -210,8 +178,6 @@ final class ByteBufferHelper
public static void putInt (ByteBuffer buffer, int index, public static void putInt (ByteBuffer buffer, int index,
int value, ByteOrder order) int value, ByteOrder order)
{ {
checkAvailableForWrite (buffer, index, 4);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
buffer.put (index, (byte) value); buffer.put (index, (byte) value);
@ -230,7 +196,7 @@ final class ByteBufferHelper
public static long getLong (ByteBuffer buffer, ByteOrder order) public static long getLong (ByteBuffer buffer, ByteOrder order)
{ {
checkRemainingForRead (buffer, 8); buffer.checkForUnderflow(8);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
@ -256,7 +222,7 @@ final class ByteBufferHelper
public static void putLong (ByteBuffer buffer, long value, ByteOrder order) public static void putLong (ByteBuffer buffer, long value, ByteOrder order)
{ {
checkRemainingForWrite (buffer, 8); buffer.checkForOverflow(8);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
@ -284,8 +250,6 @@ final class ByteBufferHelper
public static long getLong (ByteBuffer buffer, int index, ByteOrder order) public static long getLong (ByteBuffer buffer, int index, ByteOrder order)
{ {
checkAvailableForRead (buffer, index, 8);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
return ((buffer.get (index) & 0xff) return ((buffer.get (index) & 0xff)
@ -311,8 +275,6 @@ final class ByteBufferHelper
public static void putLong (ByteBuffer buffer, int index, public static void putLong (ByteBuffer buffer, int index,
long value, ByteOrder order) long value, ByteOrder order)
{ {
checkAvailableForWrite (buffer, index, 8);
if (order == ByteOrder.LITTLE_ENDIAN) if (order == ByteOrder.LITTLE_ENDIAN)
{ {
buffer.put (index, (byte) value); buffer.put (index, (byte) value);

20
libjava/java/nio/ByteBufferImpl.java
View File

@ -129,10 +129,16 @@ final class ByteBufferImpl extends ByteBuffer
} }
/** /**
* Relative get method. Reads the next <code>byte</code> from the buffer. * Reads the <code>byte</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>bytes</code> in this buffer.
*/ */
public byte get () public byte get ()
{ {
checkForUnderflow();
byte result = backing_buffer [position () + array_offset]; byte result = backing_buffer [position () + array_offset];
position (position () + 1); position (position () + 1);
return result; return result;
@ -142,12 +148,14 @@ final class ByteBufferImpl extends ByteBuffer
* Relative put method. Writes <code>value</code> to the next position * Relative put method. Writes <code>value</code> to the next position
* in the buffer. * in the buffer.
* *
* @exception BufferOverflowException If there is no remaining
* space in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public ByteBuffer put (byte value) public ByteBuffer put (byte value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkForOverflow();
int pos = position(); int pos = position();
backing_buffer [pos + array_offset] = value; backing_buffer [pos + array_offset] = value;
@ -164,6 +172,8 @@ final class ByteBufferImpl extends ByteBuffer
*/ */
public byte get (int index) public byte get (int index)
{ {
checkIndex(index);
return backing_buffer [index + array_offset]; return backing_buffer [index + array_offset];
} }
@ -177,8 +187,8 @@ final class ByteBufferImpl extends ByteBuffer
*/ */
public ByteBuffer put (int index, byte value) public ByteBuffer put (int index, byte value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkIndex(index);
backing_buffer [index + array_offset] = value; backing_buffer [index + array_offset] = value;
return this; return this;

50
libjava/java/nio/CharBuffer.java
View File

@ -137,8 +137,9 @@ public abstract class CharBuffer extends Buffer
} }
/** /**
* This method transfers <code>chars<code> from this buffer into the given * This method transfers <code>char</code>s from this buffer into the given
* destination array. * destination array. Before the transfer, it checks if there are fewer than
* length <code>char</code>s remaining in this buffer.
* *
* @param dst The destination array * @param dst The destination array
* @param offset The offset within the array of the first <code>char</code> * @param offset The offset within the array of the first <code>char</code>
@ -147,12 +148,15 @@ public abstract class CharBuffer extends Buffer
* must be non-negative and no larger than dst.length - offset. * must be non-negative and no larger than dst.length - offset.
* *
* @exception BufferUnderflowException If there are fewer than length * @exception BufferUnderflowException If there are fewer than length
* <code>chars</code> remaining in this buffer. * <code>char</code>s remaining in this buffer.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold. * and length parameters do not hold.
*/ */
public CharBuffer get (char[] dst, int offset, int length) public CharBuffer get (char[] dst, int offset, int length)
{ {
checkArraySize(dst.length, offset, length);
checkForUnderflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
{ {
dst [i] = get (); dst [i] = get ();
@ -162,13 +166,13 @@ public abstract class CharBuffer extends Buffer
} }
/** /**
* This method transfers <code>chars<code> from this buffer into the given * This method transfers <code>char</code>s from this buffer into the given
* destination array. * destination array.
* *
* @param dst The byte array to write into. * @param dst The byte array to write into.
* *
* @exception BufferUnderflowException If there are fewer than dst.length * @exception BufferUnderflowException If there are fewer than dst.length
* <code>chars</code> remaining in this buffer. * <code>char</code>s remaining in this buffer.
*/ */
public CharBuffer get (char[] dst) public CharBuffer get (char[] dst)
{ {
@ -177,12 +181,13 @@ public abstract class CharBuffer extends Buffer
/** /**
* Writes the content of the the <code>CharBUFFER</code> src * Writes the content of the the <code>CharBUFFER</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* <code>src.remaining()</code> space remaining in this buffer.
* *
* @param src The source data. * @param src The source data.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>chars<code> in the source buffer. * buffer for the remaining <code>char</code>s in the source buffer.
* @exception IllegalArgumentException If the source buffer is this buffer. * @exception IllegalArgumentException If the source buffer is this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
@ -191,8 +196,7 @@ public abstract class CharBuffer extends Buffer
if (src == this) if (src == this)
throw new IllegalArgumentException (); throw new IllegalArgumentException ();
if (src.remaining () > remaining ()) checkForOverflow(src.remaining());
throw new BufferOverflowException ();
if (src.remaining () > 0) if (src.remaining () > 0)
{ {
@ -206,7 +210,8 @@ public abstract class CharBuffer extends Buffer
/** /**
* Writes the content of the the <code>char array</code> src * Writes the content of the the <code>char array</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* length space remaining in this buffer.
* *
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* @param offset The offset within the array of the first byte to be read; * @param offset The offset within the array of the first byte to be read;
@ -215,22 +220,15 @@ public abstract class CharBuffer extends Buffer
* must be non-negative and no larger than src.length - offset. * must be non-negative and no larger than src.length - offset.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>chars<code> in the source array. * buffer for the remaining <code>char</code>s in the source array.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold * and length parameters do not hold
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public CharBuffer put (char[] src, int offset, int length) public CharBuffer put (char[] src, int offset, int length)
{ {
if (offset < 0 checkArraySize(src.length, offset, length);
|| offset >= src.length checkForOverflow(length);
|| length < 0
|| length > (src.length - offset))
throw new IndexOutOfBoundsException ();
// Put nothing into this buffer when not enough space left.
if (length > remaining ())
throw new BufferOverflowException ();
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
put (src [i]); put (src [i]);
@ -245,7 +243,7 @@ public abstract class CharBuffer extends Buffer
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>chars<code> in the source array. * buffer for the remaining <code>char</code>s in the source array.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public final CharBuffer put (char[] src) public final CharBuffer put (char[] src)
@ -275,8 +273,7 @@ public abstract class CharBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return backing_buffer; return backing_buffer;
} }
@ -293,8 +290,7 @@ public abstract class CharBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return array_offset; return array_offset;
} }
@ -362,7 +358,7 @@ public abstract class CharBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferUnderflowException If there are no remaining * @exception BufferUnderflowException If there are no remaining
* <code>chars</code> in this buffer. * <code>char</code>s in this buffer.
*/ */
public abstract char get (); public abstract char get ();
@ -371,7 +367,7 @@ public abstract class CharBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferOverflowException If there no remaining * @exception BufferOverflowException If there no remaining
* <code>chars</code> in this buffer. * <code>char</code>s in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public abstract CharBuffer put (char b); public abstract CharBuffer put (char b);

29
libjava/java/nio/CharBufferImpl.java
View File

@ -1,5 +1,5 @@
/* CharBufferImpl.java -- /* CharBufferImpl.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. This file is part of GNU Classpath.
@ -116,10 +116,16 @@ final class CharBufferImpl extends CharBuffer
} }
/** /**
* Relative get method. Reads the next <code>char</code> from the buffer. * Reads the <code>char</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>char</code>s in this buffer.
*/ */
public char get () public char get ()
{ {
checkForUnderflow();
char result = backing_buffer [position ()]; char result = backing_buffer [position ()];
position (position () + 1); position (position () + 1);
return result; return result;
@ -133,8 +139,7 @@ final class CharBufferImpl extends CharBuffer
*/ */
public CharBuffer put (char value) public CharBuffer put (char value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException ();
backing_buffer [position ()] = value; backing_buffer [position ()] = value;
position (position () + 1); position (position () + 1);
@ -145,20 +150,20 @@ final class CharBufferImpl extends CharBuffer
* Absolute get method. Reads the <code>char</code> at position * Absolute get method. Reads the <code>char</code> at position
* <code>index</code>. * <code>index</code>.
* *
* @param index Position to read the <code>char</code> from.
*
* @exception IndexOutOfBoundsException If index is negative or not smaller * @exception IndexOutOfBoundsException If index is negative or not smaller
* than the buffer's limit. * than the buffer's limit.
*/ */
public char get (int index) public char get (int index)
{ {
if (index < 0 checkIndex(index);
|| index >= limit ())
throw new IndexOutOfBoundsException ();
return backing_buffer [index]; return backing_buffer [index];
} }
/** /**
* Absolute put method. Writes <code>value</value> to position * Absolute put method. Writes <code>value</code> to position
* <code>index</code> in the buffer. * <code>index</code> in the buffer.
* *
* @exception IndexOutOfBoundsException If index is negative or not smaller * @exception IndexOutOfBoundsException If index is negative or not smaller
@ -167,12 +172,8 @@ final class CharBufferImpl extends CharBuffer
*/ */
public CharBuffer put (int index, char value) public CharBuffer put (int index, char value)
{ {
if (index < 0 checkIndex(index);
|| index >= limit ()) checkIfReadOnly();
throw new IndexOutOfBoundsException ();
if (readOnly)
throw new ReadOnlyBufferException ();
backing_buffer [index] = value; backing_buffer [index] = value;
return this; return this;

16
libjava/java/nio/CharViewBufferImpl.java
View File

@ -66,6 +66,13 @@ class CharViewBufferImpl extends CharBuffer
this.endian = endian; this.endian = endian;
} }
/**
* Reads the <code>char</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>char</code>s in this buffer.
*/
public char get () public char get ()
{ {
int p = position(); int p = position();
@ -74,6 +81,15 @@ class CharViewBufferImpl extends CharBuffer
return result; return result;
} }
/**
* Absolute get method. Reads the <code>char</code> at position
* <code>index</code>.
*
* @param index Position to read the <code>char</code> from.
*
* @exception IndexOutOfBoundsException If index is negative or not smaller
* than the buffer's limit.
*/
public char get (int index) public char get (int index)
{ {
return ByteBufferHelper.getChar(bb, (index << 1) + offset, endian); return ByteBufferHelper.getChar(bb, (index << 1) + offset, endian);

24
libjava/java/nio/DirectByteBufferImpl.java
View File

@ -86,9 +86,9 @@ final class DirectByteBufferImpl extends ByteBuffer
public byte get () public byte get ()
{ {
checkForUnderflow();
int pos = position(); int pos = position();
if (pos >= limit())
throw new BufferUnderflowException();
byte result = getImpl (address, pos); byte result = getImpl (address, pos);
position (pos + 1); position (pos + 1);
return result; return result;
@ -96,8 +96,8 @@ final class DirectByteBufferImpl extends ByteBuffer
public byte get (int index) public byte get (int index)
{ {
if (index >= limit()) checkIndex(index);
throw new BufferUnderflowException();
return getImpl (address, index); return getImpl (address, index);
} }
@ -106,10 +106,8 @@ final class DirectByteBufferImpl extends ByteBuffer
public ByteBuffer get (byte[] dst, int offset, int length) public ByteBuffer get (byte[] dst, int offset, int length)
{ {
if (offset < 0 || length < 0 || offset + length > dst.length) checkArraySize(dst.length, offset, length);
throw new IndexOutOfBoundsException (); checkForUnderflow(length);
if (length > remaining())
throw new BufferUnderflowException();
int index = position(); int index = position();
getImpl(address, index, dst, offset, length); getImpl(address, index, dst, offset, length);
@ -120,9 +118,10 @@ final class DirectByteBufferImpl extends ByteBuffer
public ByteBuffer put (byte value) public ByteBuffer put (byte value)
{ {
checkIfReadOnly();
checkForOverflow();
int pos = position(); int pos = position();
if (pos >= limit())
throw new BufferUnderflowException();
putImpl (address, pos, value); putImpl (address, pos, value);
position (pos + 1); position (pos + 1);
return this; return this;
@ -130,8 +129,9 @@ final class DirectByteBufferImpl extends ByteBuffer
public ByteBuffer put (int index, byte value) public ByteBuffer put (int index, byte value)
{ {
if (index >= limit()) checkIfReadOnly();
throw new BufferUnderflowException(); checkIndex(index);
putImpl (address, index, value); putImpl (address, index, value);
return this; return this;
} }

42
libjava/java/nio/DoubleBuffer.java
View File

@ -83,8 +83,9 @@ public abstract class DoubleBuffer extends Buffer
} }
/** /**
* This method transfers <code>doubles<code> from this buffer into the given * This method transfers <code>double</code>s from this buffer into the given
* destination array. * destination array. Before the transfer, it checks if there are fewer than
* length <code>double</code>s remaining in this buffer.
* *
* @param dst The destination array * @param dst The destination array
* @param offset The offset within the array of the first <code>double</code> * @param offset The offset within the array of the first <code>double</code>
@ -93,12 +94,15 @@ public abstract class DoubleBuffer extends Buffer
* must be non-negative and no larger than dst.length - offset. * must be non-negative and no larger than dst.length - offset.
* *
* @exception BufferUnderflowException If there are fewer than length * @exception BufferUnderflowException If there are fewer than length
* <code>doubles</code> remaining in this buffer. * <code>double</code>s remaining in this buffer.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold. * and length parameters do not hold.
*/ */
public DoubleBuffer get (double[] dst, int offset, int length) public DoubleBuffer get (double[] dst, int offset, int length)
{ {
checkArraySize(dst.length, offset, length);
checkForUnderflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
{ {
dst [i] = get (); dst [i] = get ();
@ -108,13 +112,13 @@ public abstract class DoubleBuffer extends Buffer
} }
/** /**
* This method transfers <code>doubles<code> from this buffer into the given * This method transfers <code>double</code>s from this buffer into the given
* destination array. * destination array.
* *
* @param dst The byte array to write into. * @param dst The byte array to write into.
* *
* @exception BufferUnderflowException If there are fewer than dst.length * @exception BufferUnderflowException If there are fewer than dst.length
* <code>doubles</code> remaining in this buffer. * <code>double</code>s remaining in this buffer.
*/ */
public DoubleBuffer get (double[] dst) public DoubleBuffer get (double[] dst)
{ {
@ -123,12 +127,13 @@ public abstract class DoubleBuffer extends Buffer
/** /**
* Writes the content of the the <code>DoubleBUFFER</code> src * Writes the content of the the <code>DoubleBUFFER</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* <code>src.remaining()</code> space remaining in this buffer.
* *
* @param src The source data. * @param src The source data.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>doubles<code> in the source buffer. * buffer for the remaining <code>double</code>s in the source buffer.
* @exception IllegalArgumentException If the source buffer is this buffer. * @exception IllegalArgumentException If the source buffer is this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
@ -137,8 +142,7 @@ public abstract class DoubleBuffer extends Buffer
if (src == this) if (src == this)
throw new IllegalArgumentException (); throw new IllegalArgumentException ();
if (src.remaining () > remaining ()) checkForOverflow(src.remaining ());
throw new BufferOverflowException ();
if (src.remaining () > 0) if (src.remaining () > 0)
{ {
@ -152,7 +156,8 @@ public abstract class DoubleBuffer extends Buffer
/** /**
* Writes the content of the the <code>double array</code> src * Writes the content of the the <code>double array</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* length space remaining in this buffer.
* *
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* @param offset The offset within the array of the first byte to be read; * @param offset The offset within the array of the first byte to be read;
@ -161,13 +166,16 @@ public abstract class DoubleBuffer extends Buffer
* must be non-negative and no larger than src.length - offset. * must be non-negative and no larger than src.length - offset.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>doubles<code> in the source array. * buffer for the remaining <code>double</code>s in the source array.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold * and length parameters do not hold
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public DoubleBuffer put (double[] src, int offset, int length) public DoubleBuffer put (double[] src, int offset, int length)
{ {
checkArraySize(src.length, offset, length);
checkForOverflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
put (src [i]); put (src [i]);
@ -181,7 +189,7 @@ public abstract class DoubleBuffer extends Buffer
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>doubles<code> in the source array. * buffer for the remaining <code>double</code>s in the source array.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public final DoubleBuffer put (double[] src) public final DoubleBuffer put (double[] src)
@ -211,8 +219,7 @@ public abstract class DoubleBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return backing_buffer; return backing_buffer;
} }
@ -229,8 +236,7 @@ public abstract class DoubleBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return array_offset; return array_offset;
} }
@ -298,7 +304,7 @@ public abstract class DoubleBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferUnderflowException If there are no remaining * @exception BufferUnderflowException If there are no remaining
* <code>doubles</code> in this buffer. * <code>double</code>s in this buffer.
*/ */
public abstract double get (); public abstract double get ();
@ -307,7 +313,7 @@ public abstract class DoubleBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferOverflowException If there no remaining * @exception BufferOverflowException If there no remaining
* <code>doubles</code> in this buffer. * <code>double</code>s in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public abstract DoubleBuffer put (double b); public abstract DoubleBuffer put (double b);

22
libjava/java/nio/DoubleBufferImpl.java
View File

@ -1,5 +1,5 @@
/* DoubleBufferImpl.java -- /* DoubleBufferImpl.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. This file is part of GNU Classpath.
@ -98,10 +98,16 @@ final class DoubleBufferImpl extends DoubleBuffer
} }
/** /**
* Relative get method. Reads the next <code>double</code> from the buffer. * Reads the <code>double</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>double</code>s in this buffer.
*/ */
public double get () public double get ()
{ {
checkForUnderflow();
double result = backing_buffer [position ()]; double result = backing_buffer [position ()];
position (position () + 1); position (position () + 1);
return result; return result;
@ -111,12 +117,14 @@ final class DoubleBufferImpl extends DoubleBuffer
* Relative put method. Writes <code>value</code> to the next position * Relative put method. Writes <code>value</code> to the next position
* in the buffer. * in the buffer.
* *
* @exception BufferOverflowException If there no remaining
* space in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public DoubleBuffer put (double value) public DoubleBuffer put (double value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkForOverflow();
backing_buffer [position ()] = value; backing_buffer [position ()] = value;
position (position () + 1); position (position () + 1);
@ -132,6 +140,8 @@ final class DoubleBufferImpl extends DoubleBuffer
*/ */
public double get (int index) public double get (int index)
{ {
checkIndex(index);
return backing_buffer [index]; return backing_buffer [index];
} }
@ -145,8 +155,8 @@ final class DoubleBufferImpl extends DoubleBuffer
*/ */
public DoubleBuffer put (int index, double value) public DoubleBuffer put (int index, double value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkIndex(index);
backing_buffer [index] = value; backing_buffer [index] = value;
return this; return this;

14
libjava/java/nio/DoubleViewBufferImpl.java
View File

@ -66,6 +66,13 @@ final class DoubleViewBufferImpl extends DoubleBuffer
this.endian = endian; this.endian = endian;
} }
/**
* Reads the <code>double</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>double</code>s in this buffer.
*/
public double get () public double get ()
{ {
int p = position(); int p = position();
@ -74,6 +81,13 @@ final class DoubleViewBufferImpl extends DoubleBuffer
return result; return result;
} }
/**
* Absolute get method. Reads the <code>double</code> at position
* <code>index</code>.
*
* @exception IndexOutOfBoundsException If index is negative or not smaller
* than the buffer's limit.
*/
public double get (int index) public double get (int index)
{ {
return ByteBufferHelper.getDouble(bb, (index << 3) + offset, endian); return ByteBufferHelper.getDouble(bb, (index << 3) + offset, endian);

42
libjava/java/nio/FloatBuffer.java
View File

@ -83,8 +83,9 @@ public abstract class FloatBuffer extends Buffer
} }
/** /**
* This method transfers <code>floats<code> from this buffer into the given * This method transfers <code>float</code>s from this buffer into the given
* destination array. * destination array. Before the transfer, it checks if there are fewer than
* length <code>float</code>s remaining in this buffer.
* *
* @param dst The destination array * @param dst The destination array
* @param offset The offset within the array of the first <code>float</code> * @param offset The offset within the array of the first <code>float</code>
@ -93,12 +94,15 @@ public abstract class FloatBuffer extends Buffer
* must be non-negative and no larger than dst.length - offset. * must be non-negative and no larger than dst.length - offset.
* *
* @exception BufferUnderflowException If there are fewer than length * @exception BufferUnderflowException If there are fewer than length
* <code>floats</code> remaining in this buffer. * <code>float</code>s remaining in this buffer.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold. * and length parameters do not hold.
*/ */
public FloatBuffer get (float[] dst, int offset, int length) public FloatBuffer get (float[] dst, int offset, int length)
{ {
checkArraySize(dst.length, offset, length);
checkForUnderflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
{ {
dst [i] = get (); dst [i] = get ();
@ -108,13 +112,13 @@ public abstract class FloatBuffer extends Buffer
} }
/** /**
* This method transfers <code>floats<code> from this buffer into the given * This method transfers <code>float</code>s from this buffer into the given
* destination array. * destination array.
* *
* @param dst The byte array to write into. * @param dst The byte array to write into.
* *
* @exception BufferUnderflowException If there are fewer than dst.length * @exception BufferUnderflowException If there are fewer than dst.length
* <code>floats</code> remaining in this buffer. * <code>float</code>s remaining in this buffer.
*/ */
public FloatBuffer get (float[] dst) public FloatBuffer get (float[] dst)
{ {
@ -123,12 +127,13 @@ public abstract class FloatBuffer extends Buffer
/** /**
* Writes the content of the the <code>FloatBUFFER</code> src * Writes the content of the the <code>FloatBUFFER</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* <code>src.remaining()</code> space remaining in this buffer.
* *
* @param src The source data. * @param src The source data.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>floats<code> in the source buffer. * buffer for the remaining <code>float</code>s in the source buffer.
* @exception IllegalArgumentException If the source buffer is this buffer. * @exception IllegalArgumentException If the source buffer is this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
@ -137,8 +142,7 @@ public abstract class FloatBuffer extends Buffer
if (src == this) if (src == this)
throw new IllegalArgumentException (); throw new IllegalArgumentException ();
if (src.remaining () > remaining ()) checkForOverflow(src.remaining());
throw new BufferOverflowException ();
if (src.remaining () > 0) if (src.remaining () > 0)
{ {
@ -152,7 +156,8 @@ public abstract class FloatBuffer extends Buffer
/** /**
* Writes the content of the the <code>float array</code> src * Writes the content of the the <code>float array</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* length space remaining in this buffer.
* *
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* @param offset The offset within the array of the first byte to be read; * @param offset The offset within the array of the first byte to be read;
@ -161,13 +166,16 @@ public abstract class FloatBuffer extends Buffer
* must be non-negative and no larger than src.length - offset. * must be non-negative and no larger than src.length - offset.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>floats<code> in the source array. * buffer for the remaining <code>float</code>s in the source array.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold * and length parameters do not hold
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public FloatBuffer put (float[] src, int offset, int length) public FloatBuffer put (float[] src, int offset, int length)
{ {
checkArraySize(src.length, offset, length);
checkForOverflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
put (src [i]); put (src [i]);
@ -181,7 +189,7 @@ public abstract class FloatBuffer extends Buffer
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>floats<code> in the source array. * buffer for the remaining <code>float</code>s in the source array.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public final FloatBuffer put (float[] src) public final FloatBuffer put (float[] src)
@ -211,8 +219,7 @@ public abstract class FloatBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return backing_buffer; return backing_buffer;
} }
@ -229,8 +236,7 @@ public abstract class FloatBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return array_offset; return array_offset;
} }
@ -298,7 +304,7 @@ public abstract class FloatBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferUnderflowException If there are no remaining * @exception BufferUnderflowException If there are no remaining
* <code>floats</code> in this buffer. * <code>float</code>s in this buffer.
*/ */
public abstract float get (); public abstract float get ();
@ -307,7 +313,7 @@ public abstract class FloatBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferOverflowException If there no remaining * @exception BufferOverflowException If there no remaining
* <code>floats</code> in this buffer. * <code>float</code>s in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public abstract FloatBuffer put (float b); public abstract FloatBuffer put (float b);

22
libjava/java/nio/FloatBufferImpl.java
View File

@ -1,5 +1,5 @@
/* FloatBufferImpl.java -- /* FloatBufferImpl.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. This file is part of GNU Classpath.
@ -98,10 +98,16 @@ final class FloatBufferImpl extends FloatBuffer
} }
/** /**
* Relative get method. Reads the next <code>float</code> from the buffer. * Reads the <code>float</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>floats</code> in this buffer.
*/ */
public float get () public float get ()
{ {
checkForUnderflow();
float result = backing_buffer [position ()]; float result = backing_buffer [position ()];
position (position () + 1); position (position () + 1);
return result; return result;
@ -111,12 +117,14 @@ final class FloatBufferImpl extends FloatBuffer
* Relative put method. Writes <code>value</code> to the next position * Relative put method. Writes <code>value</code> to the next position
* in the buffer. * in the buffer.
* *
* @exception BufferOverflowException If there no remaining
* space in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public FloatBuffer put (float value) public FloatBuffer put (float value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkForOverflow();
backing_buffer [position ()] = value; backing_buffer [position ()] = value;
position (position () + 1); position (position () + 1);
@ -132,6 +140,8 @@ final class FloatBufferImpl extends FloatBuffer
*/ */
public float get (int index) public float get (int index)
{ {
checkIndex(index);
return backing_buffer [index]; return backing_buffer [index];
} }
@ -145,8 +155,8 @@ final class FloatBufferImpl extends FloatBuffer
*/ */
public FloatBuffer put (int index, float value) public FloatBuffer put (int index, float value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkIndex(index);
backing_buffer [index] = value; backing_buffer [index] = value;
return this; return this;

14
libjava/java/nio/FloatViewBufferImpl.java
View File

@ -66,6 +66,13 @@ final class FloatViewBufferImpl extends FloatBuffer
this.endian = endian; this.endian = endian;
} }
/**
* Reads the <code>float</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>floats</code> in this buffer.
*/
public float get () public float get ()
{ {
int p = position(); int p = position();
@ -74,6 +81,13 @@ final class FloatViewBufferImpl extends FloatBuffer
return result; return result;
} }
/**
* Absolute get method. Reads the <code>float</code> at position
* <code>index</code>.
*
* @exception IndexOutOfBoundsException If index is negative or not smaller
* than the buffer's limit.
*/
public float get (int index) public float get (int index)
{ {
return ByteBufferHelper.getFloat(bb, (index << 2) + offset, endian); return ByteBufferHelper.getFloat(bb, (index << 2) + offset, endian);

42
libjava/java/nio/IntBuffer.java
View File

@ -83,8 +83,9 @@ public abstract class IntBuffer extends Buffer
} }
/** /**
* This method transfers <code>ints<code> from this buffer into the given * This method transfers <code>int</code>s from this buffer into the given
* destination array. * destination array. Before the transfer, it checks if there are fewer than
* length <code>int</code>s remaining in this buffer.
* *
* @param dst The destination array * @param dst The destination array
* @param offset The offset within the array of the first <code>int</code> * @param offset The offset within the array of the first <code>int</code>
@ -93,12 +94,15 @@ public abstract class IntBuffer extends Buffer
* must be non-negative and no larger than dst.length - offset. * must be non-negative and no larger than dst.length - offset.
* *
* @exception BufferUnderflowException If there are fewer than length * @exception BufferUnderflowException If there are fewer than length
* <code>ints</code> remaining in this buffer. * <code>int</code>s remaining in this buffer.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold. * and length parameters do not hold.
*/ */
public IntBuffer get (int[] dst, int offset, int length) public IntBuffer get (int[] dst, int offset, int length)
{ {
checkArraySize(dst.length, offset, length);
checkForUnderflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
{ {
dst [i] = get (); dst [i] = get ();
@ -108,13 +112,13 @@ public abstract class IntBuffer extends Buffer
} }
/** /**
* This method transfers <code>ints<code> from this buffer into the given * This method transfers <code>int</code>s from this buffer into the given
* destination array. * destination array.
* *
* @param dst The byte array to write into. * @param dst The byte array to write into.
* *
* @exception BufferUnderflowException If there are fewer than dst.length * @exception BufferUnderflowException If there are fewer than dst.length
* <code>ints</code> remaining in this buffer. * <code>int</code>s remaining in this buffer.
*/ */
public IntBuffer get (int[] dst) public IntBuffer get (int[] dst)
{ {
@ -123,12 +127,13 @@ public abstract class IntBuffer extends Buffer
/** /**
* Writes the content of the the <code>IntBUFFER</code> src * Writes the content of the the <code>IntBUFFER</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* <code>src.remaining()</code> space remaining in this buffer.
* *
* @param src The source data. * @param src The source data.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>ints<code> in the source buffer. * buffer for the remaining <code>int</code>s in the source buffer.
* @exception IllegalArgumentException If the source buffer is this buffer. * @exception IllegalArgumentException If the source buffer is this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
@ -137,8 +142,7 @@ public abstract class IntBuffer extends Buffer
if (src == this) if (src == this)
throw new IllegalArgumentException (); throw new IllegalArgumentException ();
if (src.remaining () > remaining ()) checkForOverflow(src.remaining ());
throw new BufferOverflowException ();
if (src.remaining () > 0) if (src.remaining () > 0)
{ {
@ -152,7 +156,8 @@ public abstract class IntBuffer extends Buffer
/** /**
* Writes the content of the the <code>int array</code> src * Writes the content of the the <code>int array</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* length space remaining in this buffer.
* *
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* @param offset The offset within the array of the first byte to be read; * @param offset The offset within the array of the first byte to be read;
@ -161,13 +166,16 @@ public abstract class IntBuffer extends Buffer
* must be non-negative and no larger than src.length - offset. * must be non-negative and no larger than src.length - offset.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>ints<code> in the source array. * buffer for the remaining <code>int</code>s in the source array.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold * and length parameters do not hold
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public IntBuffer put (int[] src, int offset, int length) public IntBuffer put (int[] src, int offset, int length)
{ {
checkArraySize(src.length, offset, length);
checkForOverflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
put (src [i]); put (src [i]);
@ -181,7 +189,7 @@ public abstract class IntBuffer extends Buffer
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>ints<code> in the source array. * buffer for the remaining <code>int</code>s in the source array.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public final IntBuffer put (int[] src) public final IntBuffer put (int[] src)
@ -211,8 +219,7 @@ public abstract class IntBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return backing_buffer; return backing_buffer;
} }
@ -229,8 +236,7 @@ public abstract class IntBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return array_offset; return array_offset;
} }
@ -298,7 +304,7 @@ public abstract class IntBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferUnderflowException If there are no remaining * @exception BufferUnderflowException If there are no remaining
* <code>ints</code> in this buffer. * <code>int</code>s in this buffer.
*/ */
public abstract int get (); public abstract int get ();
@ -307,7 +313,7 @@ public abstract class IntBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferOverflowException If there no remaining * @exception BufferOverflowException If there no remaining
* <code>ints</code> in this buffer. * <code>int</code>s in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public abstract IntBuffer put (int b); public abstract IntBuffer put (int b);

22
libjava/java/nio/IntBufferImpl.java
View File

@ -1,5 +1,5 @@
/* IntBufferImpl.java -- /* IntBufferImpl.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. This file is part of GNU Classpath.
@ -98,10 +98,16 @@ final class IntBufferImpl extends IntBuffer
} }
/** /**
* Relative get method. Reads the next <code>int</code> from the buffer. * Reads the <code>int</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>ints</code> in this buffer.
*/ */
public int get () public int get ()
{ {
checkForUnderflow();
int result = backing_buffer [position ()]; int result = backing_buffer [position ()];
position (position () + 1); position (position () + 1);
return result; return result;
@ -111,12 +117,14 @@ final class IntBufferImpl extends IntBuffer
* Relative put method. Writes <code>value</code> to the next position * Relative put method. Writes <code>value</code> to the next position
* in the buffer. * in the buffer.
* *
* @exception BufferOverflowException If there no remaining
* space in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public IntBuffer put (int value) public IntBuffer put (int value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkForOverflow();
backing_buffer [position ()] = value; backing_buffer [position ()] = value;
position (position () + 1); position (position () + 1);
@ -132,6 +140,8 @@ final class IntBufferImpl extends IntBuffer
*/ */
public int get (int index) public int get (int index)
{ {
checkIndex(index);
return backing_buffer [index]; return backing_buffer [index];
} }
@ -145,8 +155,8 @@ final class IntBufferImpl extends IntBuffer
*/ */
public IntBuffer put (int index, int value) public IntBuffer put (int index, int value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkIndex(index);
backing_buffer [index] = value; backing_buffer [index] = value;
return this; return this;

14
libjava/java/nio/IntViewBufferImpl.java
View File

@ -66,6 +66,13 @@ final class IntViewBufferImpl extends IntBuffer
this.endian = endian; this.endian = endian;
} }
/**
* Reads the <code>int</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>ints</code> in this buffer.
*/
public int get () public int get ()
{ {
int p = position(); int p = position();
@ -74,6 +81,13 @@ final class IntViewBufferImpl extends IntBuffer
return result; return result;
} }
/**
* Absolute get method. Reads the <code>int</code> at position
* <code>index</code>.
*
* @exception IndexOutOfBoundsException If index is negative or not smaller
* than the buffer's limit.
*/
public int get (int index) public int get (int index)
{ {
return ByteBufferHelper.getInt(bb, (index << 2) + offset, endian); return ByteBufferHelper.getInt(bb, (index << 2) + offset, endian);

42
libjava/java/nio/LongBuffer.java
View File

@ -83,8 +83,9 @@ public abstract class LongBuffer extends Buffer
} }
/** /**
* This method transfers <code>longs<code> from this buffer into the given * This method transfers <code>long</code>s from this buffer into the given
* destination array. * destination array. Before the transfer, it checks if there are fewer than
* length <code>long</code>s remaining in this buffer.
* *
* @param dst The destination array * @param dst The destination array
* @param offset The offset within the array of the first <code>long</code> * @param offset The offset within the array of the first <code>long</code>
@ -93,12 +94,15 @@ public abstract class LongBuffer extends Buffer
* must be non-negative and no larger than dst.length - offset. * must be non-negative and no larger than dst.length - offset.
* *
* @exception BufferUnderflowException If there are fewer than length * @exception BufferUnderflowException If there are fewer than length
* <code>longs</code> remaining in this buffer. * <code>long</code>s remaining in this buffer.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold. * and length parameters do not hold.
*/ */
public LongBuffer get (long[] dst, int offset, int length) public LongBuffer get (long[] dst, int offset, int length)
{ {
checkArraySize(dst.length, offset, length);
checkForUnderflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
{ {
dst [i] = get (); dst [i] = get ();
@ -108,13 +112,13 @@ public abstract class LongBuffer extends Buffer
} }
/** /**
* This method transfers <code>longs<code> from this buffer into the given * This method transfers <code>long</code>s from this buffer into the given
* destination array. * destination array.
* *
* @param dst The byte array to write into. * @param dst The byte array to write into.
* *
* @exception BufferUnderflowException If there are fewer than dst.length * @exception BufferUnderflowException If there are fewer than dst.length
* <code>longs</code> remaining in this buffer. * <code>long</code>s remaining in this buffer.
*/ */
public LongBuffer get (long[] dst) public LongBuffer get (long[] dst)
{ {
@ -123,12 +127,13 @@ public abstract class LongBuffer extends Buffer
/** /**
* Writes the content of the the <code>LongBUFFER</code> src * Writes the content of the the <code>LongBUFFER</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* <code>src.remaining()</code> space remaining in this buffer.
* *
* @param src The source data. * @param src The source data.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>longs<code> in the source buffer. * buffer for the remaining <code>long</code>s in the source buffer.
* @exception IllegalArgumentException If the source buffer is this buffer. * @exception IllegalArgumentException If the source buffer is this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
@ -137,8 +142,7 @@ public abstract class LongBuffer extends Buffer
if (src == this) if (src == this)
throw new IllegalArgumentException (); throw new IllegalArgumentException ();
if (src.remaining () > remaining ()) checkForOverflow(src.remaining ());
throw new BufferOverflowException ();
if (src.remaining () > 0) if (src.remaining () > 0)
{ {
@ -152,7 +156,8 @@ public abstract class LongBuffer extends Buffer
/** /**
* Writes the content of the the <code>long array</code> src * Writes the content of the the <code>long array</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* length space remaining in this buffer.
* *
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* @param offset The offset within the array of the first byte to be read; * @param offset The offset within the array of the first byte to be read;
@ -161,13 +166,16 @@ public abstract class LongBuffer extends Buffer
* must be non-negative and no larger than src.length - offset. * must be non-negative and no larger than src.length - offset.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>longs<code> in the source array. * buffer for the remaining <code>long</code>s in the source array.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold * and length parameters do not hold
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public LongBuffer put (long[] src, int offset, int length) public LongBuffer put (long[] src, int offset, int length)
{ {
checkArraySize(src.length, offset, length);
checkForOverflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
put (src [i]); put (src [i]);
@ -181,7 +189,7 @@ public abstract class LongBuffer extends Buffer
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>longs<code> in the source array. * buffer for the remaining <code>long</code>s in the source array.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public final LongBuffer put (long[] src) public final LongBuffer put (long[] src)
@ -211,8 +219,7 @@ public abstract class LongBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return backing_buffer; return backing_buffer;
} }
@ -229,8 +236,7 @@ public abstract class LongBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return array_offset; return array_offset;
} }
@ -298,7 +304,7 @@ public abstract class LongBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferUnderflowException If there are no remaining * @exception BufferUnderflowException If there are no remaining
* <code>longs</code> in this buffer. * <code>long</code>s in this buffer.
*/ */
public abstract long get (); public abstract long get ();
@ -307,7 +313,7 @@ public abstract class LongBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferOverflowException If there no remaining * @exception BufferOverflowException If there no remaining
* <code>longs</code> in this buffer. * <code>long</code>s in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public abstract LongBuffer put (long b); public abstract LongBuffer put (long b);

22
libjava/java/nio/LongBufferImpl.java
View File

@ -1,5 +1,5 @@
/* LongBufferImpl.java -- /* LongBufferImpl.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. This file is part of GNU Classpath.
@ -98,10 +98,16 @@ final class LongBufferImpl extends LongBuffer
} }
/** /**
* Relative get method. Reads the next <code>long</code> from the buffer. * Reads the <code>long</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>longs</code> in this buffer.
*/ */
public long get () public long get ()
{ {
checkForUnderflow();
long result = backing_buffer [position ()]; long result = backing_buffer [position ()];
position (position () + 1); position (position () + 1);
return result; return result;
@ -111,12 +117,14 @@ final class LongBufferImpl extends LongBuffer
* Relative put method. Writes <code>value</code> to the next position * Relative put method. Writes <code>value</code> to the next position
* in the buffer. * in the buffer.
* *
* @exception BufferOverflowException If there is insufficient space in this
* buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public LongBuffer put (long value) public LongBuffer put (long value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkForOverflow();
backing_buffer [position ()] = value; backing_buffer [position ()] = value;
position (position () + 1); position (position () + 1);
@ -132,6 +140,8 @@ final class LongBufferImpl extends LongBuffer
*/ */
public long get (int index) public long get (int index)
{ {
checkIndex(index);
return backing_buffer [index]; return backing_buffer [index];
} }
@ -145,8 +155,8 @@ final class LongBufferImpl extends LongBuffer
*/ */
public LongBuffer put (int index, long value) public LongBuffer put (int index, long value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkIndex(index);
backing_buffer [index] = value; backing_buffer [index] = value;
return this; return this;

14
libjava/java/nio/LongViewBufferImpl.java
View File

@ -66,6 +66,13 @@ final class LongViewBufferImpl extends LongBuffer
this.endian = endian; this.endian = endian;
} }
/**
* Reads the <code>long</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>longs</code> in this buffer.
*/
public long get () public long get ()
{ {
int p = position(); int p = position();
@ -74,6 +81,13 @@ final class LongViewBufferImpl extends LongBuffer
return result; return result;
} }
/**
* Absolute get method. Reads the <code>long</code> at position
* <code>index</code>.
*
* @exception IndexOutOfBoundsException If index is negative or not smaller
* than the buffer's limit.
*/
public long get (int index) public long get (int index)
{ {
return ByteBufferHelper.getLong(bb, (index << 3) + offset, endian); return ByteBufferHelper.getLong(bb, (index << 3) + offset, endian);

24
libjava/java/nio/MappedByteBufferImpl.java
View File

@ -68,9 +68,9 @@ final class MappedByteBufferImpl extends MappedByteBuffer
public byte get () public byte get ()
{ {
checkForUnderflow();
int pos = position(); int pos = position();
if (pos >= limit())
throw new BufferUnderflowException();
byte result = DirectByteBufferImpl.getImpl(address, pos); byte result = DirectByteBufferImpl.getImpl(address, pos);
position (pos + 1); position (pos + 1);
return result; return result;
@ -78,9 +78,10 @@ final class MappedByteBufferImpl extends MappedByteBuffer
public ByteBuffer put (byte value) public ByteBuffer put (byte value)
{ {
checkIfReadOnly();
checkForOverflow();
int pos = position(); int pos = position();
if (pos >= limit())
throw new BufferUnderflowException();
DirectByteBufferImpl.putImpl(address, pos, value); DirectByteBufferImpl.putImpl(address, pos, value);
position(pos + 1); position(pos + 1);
return this; return this;
@ -88,17 +89,15 @@ final class MappedByteBufferImpl extends MappedByteBuffer
public byte get (int index) public byte get (int index)
{ {
if (index >= limit()) checkIndex(index);
throw new BufferUnderflowException();
return DirectByteBufferImpl.getImpl(address, index); return DirectByteBufferImpl.getImpl(address, index);
} }
public ByteBuffer get (byte[] dst, int offset, int length) public ByteBuffer get (byte[] dst, int offset, int length)
{ {
if (offset < 0 || length < 0 || offset + length > dst.length) checkArraySize(dst.length, offset, length);
throw new IndexOutOfBoundsException (); checkForUnderflow(length);
if (length > remaining())
throw new BufferUnderflowException();
int index = position(); int index = position();
DirectByteBufferImpl.getImpl(address, index, dst, offset, length); DirectByteBufferImpl.getImpl(address, index, dst, offset, length);
@ -109,8 +108,9 @@ final class MappedByteBufferImpl extends MappedByteBuffer
public ByteBuffer put (int index, byte value) public ByteBuffer put (int index, byte value)
{ {
if (index >= limit()) checkIfReadOnly();
throw new BufferUnderflowException(); checkIndex(index);
DirectByteBufferImpl.putImpl(address, index, value); DirectByteBufferImpl.putImpl(address, index, value);
return this; return this;
} }

42
libjava/java/nio/ShortBuffer.java
View File

@ -83,8 +83,9 @@ public abstract class ShortBuffer extends Buffer
} }
/** /**
* This method transfers <code>shorts<code> from this buffer into the given * This method transfers <code>short</code>s from this buffer into the given
* destination array. * destination array. Before the transfer, it checks if there are fewer than
* length <code>short</code>s remaining in this buffer.
* *
* @param dst The destination array * @param dst The destination array
* @param offset The offset within the array of the first <code>short</code> * @param offset The offset within the array of the first <code>short</code>
@ -93,12 +94,15 @@ public abstract class ShortBuffer extends Buffer
* must be non-negative and no larger than dst.length - offset. * must be non-negative and no larger than dst.length - offset.
* *
* @exception BufferUnderflowException If there are fewer than length * @exception BufferUnderflowException If there are fewer than length
* <code>shorts</code> remaining in this buffer. * <code>short</code>s remaining in this buffer.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold. * and length parameters do not hold.
*/ */
public ShortBuffer get (short[] dst, int offset, int length) public ShortBuffer get (short[] dst, int offset, int length)
{ {
checkArraySize(dst.length, offset, length);
checkForUnderflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
{ {
dst [i] = get (); dst [i] = get ();
@ -108,13 +112,13 @@ public abstract class ShortBuffer extends Buffer
} }
/** /**
* This method transfers <code>shorts<code> from this buffer into the given * This method transfers <code>short</code>s from this buffer into the given
* destination array. * destination array.
* *
* @param dst The byte array to write into. * @param dst The byte array to write into.
* *
* @exception BufferUnderflowException If there are fewer than dst.length * @exception BufferUnderflowException If there are fewer than dst.length
* <code>shorts</code> remaining in this buffer. * <code>short</code>s remaining in this buffer.
*/ */
public ShortBuffer get (short[] dst) public ShortBuffer get (short[] dst)
{ {
@ -123,12 +127,13 @@ public abstract class ShortBuffer extends Buffer
/** /**
* Writes the content of the the <code>ShortBUFFER</code> src * Writes the content of the the <code>ShortBUFFER</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* <code>src.remaining()</code> space remaining in this buffer.
* *
* @param src The source data. * @param src The source data.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>shorts<code> in the source buffer. * buffer for the remaining <code>short</code>s in the source buffer.
* @exception IllegalArgumentException If the source buffer is this buffer. * @exception IllegalArgumentException If the source buffer is this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
@ -137,8 +142,7 @@ public abstract class ShortBuffer extends Buffer
if (src == this) if (src == this)
throw new IllegalArgumentException (); throw new IllegalArgumentException ();
if (src.remaining () > remaining ()) checkForOverflow(src.remaining ());
throw new BufferOverflowException ();
if (src.remaining () > 0) if (src.remaining () > 0)
{ {
@ -152,7 +156,8 @@ public abstract class ShortBuffer extends Buffer
/** /**
* Writes the content of the the <code>short array</code> src * Writes the content of the the <code>short array</code> src
* into the buffer. * into the buffer. Before the transfer, it checks if there is fewer than
* length space remaining in this buffer.
* *
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* @param offset The offset within the array of the first byte to be read; * @param offset The offset within the array of the first byte to be read;
@ -161,13 +166,16 @@ public abstract class ShortBuffer extends Buffer
* must be non-negative and no larger than src.length - offset. * must be non-negative and no larger than src.length - offset.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>shorts<code> in the source array. * buffer for the remaining <code>short</code>s in the source array.
* @exception IndexOutOfBoundsException If the preconditions on the offset * @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold * and length parameters do not hold
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public ShortBuffer put (short[] src, int offset, int length) public ShortBuffer put (short[] src, int offset, int length)
{ {
checkArraySize(src.length, offset, length);
checkForOverflow(length);
for (int i = offset; i < offset + length; i++) for (int i = offset; i < offset + length; i++)
put (src [i]); put (src [i]);
@ -181,7 +189,7 @@ public abstract class ShortBuffer extends Buffer
* @param src The array to copy into the buffer. * @param src The array to copy into the buffer.
* *
* @exception BufferOverflowException If there is insufficient space in this * @exception BufferOverflowException If there is insufficient space in this
* buffer for the remaining <code>shorts<code> in the source array. * buffer for the remaining <code>short</code>s in the source array.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public final ShortBuffer put (short[] src) public final ShortBuffer put (short[] src)
@ -211,8 +219,7 @@ public abstract class ShortBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return backing_buffer; return backing_buffer;
} }
@ -229,8 +236,7 @@ public abstract class ShortBuffer extends Buffer
if (backing_buffer == null) if (backing_buffer == null)
throw new UnsupportedOperationException (); throw new UnsupportedOperationException ();
if (isReadOnly ()) checkIfReadOnly();
throw new ReadOnlyBufferException ();
return array_offset; return array_offset;
} }
@ -298,7 +304,7 @@ public abstract class ShortBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferUnderflowException If there are no remaining * @exception BufferUnderflowException If there are no remaining
* <code>shorts</code> in this buffer. * <code>short</code>s in this buffer.
*/ */
public abstract short get (); public abstract short get ();
@ -307,7 +313,7 @@ public abstract class ShortBuffer extends Buffer
* and then increments the position. * and then increments the position.
* *
* @exception BufferOverflowException If there no remaining * @exception BufferOverflowException If there no remaining
* <code>shorts</code> in this buffer. * <code>short</code>s in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public abstract ShortBuffer put (short b); public abstract ShortBuffer put (short b);

22
libjava/java/nio/ShortBufferImpl.java
View File

@ -1,5 +1,5 @@
/* ShortBufferImpl.java -- /* ShortBufferImpl.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. This file is part of GNU Classpath.
@ -98,10 +98,16 @@ final class ShortBufferImpl extends ShortBuffer
} }
/** /**
* Relative get method. Reads the next <code>short</code> from the buffer. * Reads the <code>short</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>short</code>s in this buffer.
*/ */
public short get () public short get ()
{ {
checkForUnderflow();
short result = backing_buffer [position ()]; short result = backing_buffer [position ()];
position (position () + 1); position (position () + 1);
return result; return result;
@ -111,12 +117,14 @@ final class ShortBufferImpl extends ShortBuffer
* Relative put method. Writes <code>value</code> to the next position * Relative put method. Writes <code>value</code> to the next position
* in the buffer. * in the buffer.
* *
* @exception BufferOverflowException If there no remaining
* space in this buffer.
* @exception ReadOnlyBufferException If this buffer is read-only. * @exception ReadOnlyBufferException If this buffer is read-only.
*/ */
public ShortBuffer put (short value) public ShortBuffer put (short value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkForOverflow();
backing_buffer [position ()] = value; backing_buffer [position ()] = value;
position (position () + 1); position (position () + 1);
@ -132,6 +140,8 @@ final class ShortBufferImpl extends ShortBuffer
*/ */
public short get (int index) public short get (int index)
{ {
checkIndex(index);
return backing_buffer [index]; return backing_buffer [index];
} }
@ -145,8 +155,8 @@ final class ShortBufferImpl extends ShortBuffer
*/ */
public ShortBuffer put (int index, short value) public ShortBuffer put (int index, short value)
{ {
if (readOnly) checkIfReadOnly();
throw new ReadOnlyBufferException (); checkIndex(index);
backing_buffer [index] = value; backing_buffer [index] = value;
return this; return this;

14
libjava/java/nio/ShortViewBufferImpl.java
View File

@ -66,6 +66,13 @@ final class ShortViewBufferImpl extends ShortBuffer
this.endian = endian; this.endian = endian;
} }
/**
* Reads the <code>short</code> at this buffer's current position,
* and then increments the position.
*
* @exception BufferUnderflowException If there are no remaining
* <code>short</code>s in this buffer.
*/
public short get () public short get ()
{ {
int p = position(); int p = position();
@ -74,6 +81,13 @@ final class ShortViewBufferImpl extends ShortBuffer
return result; return result;
} }
/**
* Absolute get method. Reads the <code>short</code> at position
* <code>index</code>.
*
* @exception IndexOutOfBoundsException If index is negative or not smaller
* than the buffer's limit.
*/
public short get (int index) public short get (int index)
{ {
return ByteBufferHelper.getShort(bb, (index << 1) + offset, endian); return ByteBufferHelper.getShort(bb, (index << 1) + offset, endian);