From 681979f075ee4d1473afafb1e5cf81f1eb8d1dc3 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Wed, 19 Feb 2003 11:47:49 +0000 Subject: 2003-02-19 Michael Koch * gnu/java/nio/ByteBufferImpl.java (ByteBufferImpl): Renamed two variables. * gnu/java/nio/CharBufferImpl.java (CharBufferImpl): Renamed two variables. * gnu/java/nio/DoubleBufferImpl.java (DoubleBufferImpl): Renamed two variables. * gnu/java/nio/FloatBufferImpl.java (FloatBufferImpl): Renamed two variables. * gnu/java/nio/IntBufferImpl.java (IntBufferImpl): Renamed two variables. * gnu/java/nio/LongBufferImpl.java (LongBufferImpl): Renamed two variables. * gnu/java/nio/ShortBufferImpl.java (ShortBufferImpl): Renamed two variables. * java/nio/CharBuffer.java (wrap): Fixed arguments to CharBufferImpl constructor. (hasArray): Only not read-only buffers have backing arrays. (length): Documentation added. (subSequence): Documentation added. * java/nio/DoubleBuffer.java (hasArray): Only not read-only buffers have backing arrays. * java/nio/FloatBuffer.java (hasArray): Only not read-only buffers have backing arrays. * java/nio/IntBuffer.java (hasArray): Only not read-only buffers have backing arrays. * java/nio/LongBuffer.java (hasArray): Only not read-only buffers have backing arrays. * java/nio/ShortBuffer.java (hasArray): Only not read-only buffers have backing arrays. From-SVN: r63101 --- libjava/java/nio/CharBuffer.java | 11 +++++++++-- libjava/java/nio/DoubleBuffer.java | 3 ++- libjava/java/nio/FloatBuffer.java | 3 ++- libjava/java/nio/IntBuffer.java | 3 ++- libjava/java/nio/LongBuffer.java | 3 ++- libjava/java/nio/ShortBuffer.java | 3 ++- 6 files changed, 19 insertions(+), 7 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/nio/CharBuffer.java b/libjava/java/nio/CharBuffer.java index 9d61be9..e299602 100644 --- a/libjava/java/nio/CharBuffer.java +++ b/libjava/java/nio/CharBuffer.java @@ -63,7 +63,7 @@ public abstract class CharBuffer extends Buffer */ final public static CharBuffer wrap (char[] array, int offset, int length) { - return new CharBufferImpl (array, offset, offset + length); + return new CharBufferImpl (array, offset, length); } /** @@ -205,7 +205,8 @@ public abstract class CharBuffer extends Buffer */ public final boolean hasArray () { - return backing_buffer != null; + return (backing_buffer != null + && ! isReadOnly ()); } /** @@ -359,6 +360,9 @@ public abstract class CharBuffer extends Buffer return new String (array (), position (), length ()); } + /** + * Returns the length of the remaining chars in this buffer. + */ public final int length () { return remaining (); @@ -370,6 +374,9 @@ public abstract class CharBuffer extends Buffer public abstract ByteOrder order (); /** + * Creates a new character buffer that represents the specified subsequence + * of this buffer, relative to the current position. + * * @exception IndexOutOfBoundsException If the preconditions on start and * end do not hold. */ diff --git a/libjava/java/nio/DoubleBuffer.java b/libjava/java/nio/DoubleBuffer.java index 036579a..27f3a16 100644 --- a/libjava/java/nio/DoubleBuffer.java +++ b/libjava/java/nio/DoubleBuffer.java @@ -120,7 +120,8 @@ public abstract class DoubleBuffer extends Buffer implements Comparable public final boolean hasArray() { - return (backing_buffer != null); + return (backing_buffer != null + && !isReadOnly ()); } public final double[] array() diff --git a/libjava/java/nio/FloatBuffer.java b/libjava/java/nio/FloatBuffer.java index 8531cb9..16c92d6 100644 --- a/libjava/java/nio/FloatBuffer.java +++ b/libjava/java/nio/FloatBuffer.java @@ -121,7 +121,8 @@ public abstract class FloatBuffer extends Buffer implements Comparable public final boolean hasArray() { - return (backing_buffer != null); + return (backing_buffer != null + && !isReadOnly ()); } public final float[] array() diff --git a/libjava/java/nio/IntBuffer.java b/libjava/java/nio/IntBuffer.java index ddf03d8..18e353b 100644 --- a/libjava/java/nio/IntBuffer.java +++ b/libjava/java/nio/IntBuffer.java @@ -121,7 +121,8 @@ public abstract class IntBuffer extends Buffer implements Comparable public final boolean hasArray() { - return (backing_buffer != null); + return (backing_buffer != null + && !isReadOnly ()); } public final int[] array() diff --git a/libjava/java/nio/LongBuffer.java b/libjava/java/nio/LongBuffer.java index 63eb5af..8b73719 100644 --- a/libjava/java/nio/LongBuffer.java +++ b/libjava/java/nio/LongBuffer.java @@ -121,7 +121,8 @@ public abstract class LongBuffer extends Buffer implements Comparable public final boolean hasArray() { - return (backing_buffer != null); + return (backing_buffer != null + && !isReadOnly ()); } public final long[] array() diff --git a/libjava/java/nio/ShortBuffer.java b/libjava/java/nio/ShortBuffer.java index 7a71cad..8c5915d 100644 --- a/libjava/java/nio/ShortBuffer.java +++ b/libjava/java/nio/ShortBuffer.java @@ -121,7 +121,8 @@ public abstract class ShortBuffer extends Buffer implements Comparable public final boolean hasArray() { - return (backing_buffer != null); + return (backing_buffer != null + && !isReadOnly ()); } public final short[] array() -- cgit v1.1