From 23c41c08339da4bdf677ade01e17d940b7ce6201 Mon Sep 17 00:00:00 2001 From: Dalibor Topic Date: Fri, 9 Jul 2004 13:40:29 +0000 Subject: Buffer.java, [...]: Fixed javadocs all over. 2004-07-09 Dalibor Topic * 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 --- libjava/java/nio/FloatBuffer.java | 42 ++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'libjava/java/nio/FloatBuffer.java') diff --git a/libjava/java/nio/FloatBuffer.java b/libjava/java/nio/FloatBuffer.java index ab87b7f..2425f0c 100644 --- a/libjava/java/nio/FloatBuffer.java +++ b/libjava/java/nio/FloatBuffer.java @@ -83,8 +83,9 @@ public abstract class FloatBuffer extends Buffer } /** - * This method transfers floats from this buffer into the given - * destination array. + * This method transfers floats from this buffer into the given + * destination array. Before the transfer, it checks if there are fewer than + * length floats remaining in this buffer. * * @param dst The destination array * @param offset The offset within the array of the first float @@ -93,12 +94,15 @@ public abstract class FloatBuffer extends Buffer * must be non-negative and no larger than dst.length - offset. * * @exception BufferUnderflowException If there are fewer than length - * floats remaining in this buffer. + * floats remaining in this buffer. * @exception IndexOutOfBoundsException If the preconditions on the offset * and length parameters do not hold. */ public FloatBuffer get (float[] dst, int offset, int length) { + checkArraySize(dst.length, offset, length); + checkForUnderflow(length); + for (int i = offset; i < offset + length; i++) { dst [i] = get (); @@ -108,13 +112,13 @@ public abstract class FloatBuffer extends Buffer } /** - * This method transfers floats from this buffer into the given + * This method transfers floats from this buffer into the given * destination array. * * @param dst The byte array to write into. * * @exception BufferUnderflowException If there are fewer than dst.length - * floats remaining in this buffer. + * floats remaining in this buffer. */ public FloatBuffer get (float[] dst) { @@ -123,12 +127,13 @@ public abstract class FloatBuffer extends Buffer /** * Writes the content of the the FloatBUFFER src - * into the buffer. + * into the buffer. Before the transfer, it checks if there is fewer than + * src.remaining() space remaining in this buffer. * * @param src The source data. * * @exception BufferOverflowException If there is insufficient space in this - * buffer for the remaining floats in the source buffer. + * buffer for the remaining floats in the source buffer. * @exception IllegalArgumentException If the source buffer is this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -137,8 +142,7 @@ public abstract class FloatBuffer extends Buffer if (src == this) throw new IllegalArgumentException (); - if (src.remaining () > remaining ()) - throw new BufferOverflowException (); + checkForOverflow(src.remaining()); if (src.remaining () > 0) { @@ -152,7 +156,8 @@ public abstract class FloatBuffer extends Buffer /** * Writes the content of the the float array 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 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. * * @exception BufferOverflowException If there is insufficient space in this - * buffer for the remaining floats in the source array. + * buffer for the remaining floats in the source array. * @exception IndexOutOfBoundsException If the preconditions on the offset * and length parameters do not hold * @exception ReadOnlyBufferException If this buffer is read-only. */ public FloatBuffer put (float[] src, int offset, int length) { + checkArraySize(src.length, offset, length); + checkForOverflow(length); + for (int i = offset; i < offset + length; i++) put (src [i]); @@ -181,7 +189,7 @@ public abstract class FloatBuffer extends Buffer * @param src The array to copy into the buffer. * * @exception BufferOverflowException If there is insufficient space in this - * buffer for the remaining floats in the source array. + * buffer for the remaining floats in the source array. * @exception ReadOnlyBufferException If this buffer is read-only. */ public final FloatBuffer put (float[] src) @@ -211,8 +219,7 @@ public abstract class FloatBuffer extends Buffer if (backing_buffer == null) throw new UnsupportedOperationException (); - if (isReadOnly ()) - throw new ReadOnlyBufferException (); + checkIfReadOnly(); return backing_buffer; } @@ -229,8 +236,7 @@ public abstract class FloatBuffer extends Buffer if (backing_buffer == null) throw new UnsupportedOperationException (); - if (isReadOnly ()) - throw new ReadOnlyBufferException (); + checkIfReadOnly(); return array_offset; } @@ -298,7 +304,7 @@ public abstract class FloatBuffer extends Buffer * and then increments the position. * * @exception BufferUnderflowException If there are no remaining - * floats in this buffer. + * floats in this buffer. */ public abstract float get (); @@ -307,7 +313,7 @@ public abstract class FloatBuffer extends Buffer * and then increments the position. * * @exception BufferOverflowException If there no remaining - * floats in this buffer. + * floats in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ public abstract FloatBuffer put (float b); -- cgit v1.1