From 2c478ce37c601f4a6a5f39aebe32aaa236ffebf6 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 9 May 2003 07:55:59 +0000 Subject: [PATCH] 2003-05-09 Michael Koch * gnu/java/nio/ByteBufferImpl.java (nio_cast): Removed. (ByteBufferImpl): Removed. (nio_get_Byte): Removed. (nio_put_Byte): Removed. (asByteBuffer): Removed. (asCharBuffer): Removed implementation and throw exception. (asShortBuffer): Likewise. (asIntBuffer): Likewise. (asLongBuffer): Likewise. (asFloatBuffer): Likewise. (asDoubleBuffer): Likewise. * gnu/java/nio/CharBufferImpl.java (CharBufferImpl): Removed. (nio_get_Byte): Removed. (nio_put_Byte): Removed. (asByteBuffer): Removed. * gnu/java/nio/DoubleBufferImpl.java (DoubleBufferImpl): Removed. (nio_get_Byte): Removed. (nio_put_Byte): Removed. (asByteBuffer): Removed. * gnu/java/nio/FloatBufferImpl.java (FloatBufferImpl): Removed. (nio_get_Byte): Removed. (nio_put_Byte): Removed. (asByteBuffer): Removed. * gnu/java/nio/IntBufferImpl.java (IntBufferImpl): Removed. (nio_get_Byte): Removed. (nio_put_Byte): Removed. (asByteBuffer): Removed. * gnu/java/nio/LongBufferImpl.java (LongBufferImpl): Removed. (nio_get_Byte): Removed. (nio_put_Byte): Removed. (asByteBuffer): Removed. * gnu/java/nio/ShortBufferImpl.java (ShortBufferImpl): Removed. (nio_get_Byte): Removed. (nio_put_Byte): Removed. (asByteBuffer): Removed. * gnu/java/nio/natByteBufferImpl.cc (nio_cast): Removed. (nio_get_Byte): Removed. (nio_put_Byte): Removed. * gnu/java/nio/natCharBufferImpl.cc (nio_get_Byte): Removed. (nio_put_Byte): Removed. From-SVN: r66626 --- libjava/ChangeLog | 52 ++++++++++++ libjava/gnu/java/nio/ByteBufferImpl.java | 92 ++-------------------- libjava/gnu/java/nio/CharBufferImpl.java | 19 ----- libjava/gnu/java/nio/DoubleBufferImpl.java | 20 ----- libjava/gnu/java/nio/FloatBufferImpl.java | 20 ----- libjava/gnu/java/nio/IntBufferImpl.java | 20 ----- libjava/gnu/java/nio/LongBufferImpl.java | 20 ----- libjava/gnu/java/nio/ShortBufferImpl.java | 20 ----- libjava/gnu/java/nio/natByteBufferImpl.cc | 53 ------------- libjava/gnu/java/nio/natCharBufferImpl.cc | 11 --- 10 files changed, 58 insertions(+), 269 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 52c0ce139fb..7458c91d83e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,55 @@ +2003-05-09 Michael Koch + + * gnu/java/nio/ByteBufferImpl.java + (nio_cast): Removed. + (ByteBufferImpl): Removed. + (nio_get_Byte): Removed. + (nio_put_Byte): Removed. + (asByteBuffer): Removed. + (asCharBuffer): Removed implementation and throw exception. + (asShortBuffer): Likewise. + (asIntBuffer): Likewise. + (asLongBuffer): Likewise. + (asFloatBuffer): Likewise. + (asDoubleBuffer): Likewise. + * gnu/java/nio/CharBufferImpl.java + (CharBufferImpl): Removed. + (nio_get_Byte): Removed. + (nio_put_Byte): Removed. + (asByteBuffer): Removed. + * gnu/java/nio/DoubleBufferImpl.java + (DoubleBufferImpl): Removed. + (nio_get_Byte): Removed. + (nio_put_Byte): Removed. + (asByteBuffer): Removed. + * gnu/java/nio/FloatBufferImpl.java + (FloatBufferImpl): Removed. + (nio_get_Byte): Removed. + (nio_put_Byte): Removed. + (asByteBuffer): Removed. + * gnu/java/nio/IntBufferImpl.java + (IntBufferImpl): Removed. + (nio_get_Byte): Removed. + (nio_put_Byte): Removed. + (asByteBuffer): Removed. + * gnu/java/nio/LongBufferImpl.java + (LongBufferImpl): Removed. + (nio_get_Byte): Removed. + (nio_put_Byte): Removed. + (asByteBuffer): Removed. + * gnu/java/nio/ShortBufferImpl.java + (ShortBufferImpl): Removed. + (nio_get_Byte): Removed. + (nio_put_Byte): Removed. + (asByteBuffer): Removed. + * gnu/java/nio/natByteBufferImpl.cc + (nio_cast): Removed. + (nio_get_Byte): Removed. + (nio_put_Byte): Removed. + * gnu/java/nio/natCharBufferImpl.cc + (nio_get_Byte): Removed. + (nio_put_Byte): Removed. + 2003-05-09 Michael Koch * java/net/JarURLConnection.java diff --git a/libjava/gnu/java/nio/ByteBufferImpl.java b/libjava/gnu/java/nio/ByteBufferImpl.java index 342f3316a70..ede16aa2e25 100644 --- a/libjava/gnu/java/nio/ByteBufferImpl.java +++ b/libjava/gnu/java/nio/ByteBufferImpl.java @@ -79,138 +79,58 @@ public final class ByteBufferImpl extends ByteBuffer position (position () + toAdd); } - private static native byte[] nio_cast(byte[]copy); - private static native byte[] nio_cast(char[]copy); - private static native byte[] nio_cast(short[]copy); - private static native byte[] nio_cast(long[]copy); - private static native byte[] nio_cast(int[]copy); - private static native byte[] nio_cast(float[]copy); - private static native byte[] nio_cast(double[]copy); - - ByteBufferImpl (byte[] copy) - { - super (copy.length, copy.length, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - - private static native byte nio_get_Byte (ByteBufferImpl b, int index, int limit); - - private static native void nio_put_Byte (ByteBufferImpl b, int index, int limit, byte value); - - public ByteBuffer asByteBuffer () - { - ByteBufferImpl res = new ByteBufferImpl (backing_buffer); - res.limit ((limit () * 1) / 1); - return res; - } - - ByteBufferImpl (char[] copy) - { - super (copy.length * 2, copy.length * 2, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - private static native char nio_get_Char (ByteBufferImpl b, int index, int limit); private static native void nio_put_Char (ByteBufferImpl b, int index, int limit, char value); public CharBuffer asCharBuffer () { - CharBufferImpl res = new CharBufferImpl (backing_buffer); - res.limit ((limit () * 2) / 1); - return res; + throw new Error ("Not implemented"); } - ByteBufferImpl (short[] copy) - { - super (copy.length, copy.length, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - private static native short nio_get_Short (ByteBufferImpl b, int index, int limit); private static native void nio_put_Short (ByteBufferImpl b, int index, int limit, short value); public ShortBuffer asShortBuffer () { - ShortBufferImpl res = new ShortBufferImpl (backing_buffer); - res.limit ((limit () * 2) / 1); - return res; + throw new Error ("Not implemented"); } - ByteBufferImpl (int[] copy) - { - super (copy.length * 4, copy.length * 4, 0, 0); - this.backing_buffer = copy != null ? nio_cast(copy) : null; - readOnly = false; - } - private static native int nio_get_Int (ByteBufferImpl b, int index, int limit); private static native void nio_put_Int (ByteBufferImpl b, int index, int limit, int value); public IntBuffer asIntBuffer () { - IntBufferImpl res = new IntBufferImpl (backing_buffer); - res.limit ((limit() * 4) / 1); - return res; + throw new Error ("Not implemented"); } - ByteBufferImpl (long[] copy) - { - super (copy.length * 8, copy.length * 8, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - private static native long nio_get_Long (ByteBufferImpl b, int index, int limit); private static native void nio_put_Long (ByteBufferImpl b, int index, int limit, long value); public LongBuffer asLongBuffer () { - LongBufferImpl res = new LongBufferImpl (backing_buffer); - res.limit ((limit() * 8) / 1); - return res; + throw new Error ("Not implemented"); } - ByteBufferImpl (float[] copy) - { - super (copy.length * 4, copy.length * 4, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - private static native float nio_get_Float (ByteBufferImpl b, int index, int limit); private static native void nio_put_Float (ByteBufferImpl b, int index, int limit, float value); public FloatBuffer asFloatBuffer () { - FloatBufferImpl res = new FloatBufferImpl (backing_buffer); - res.limit ((limit() * 4) / 1); - return res; + throw new Error ("Not implemented"); } - ByteBufferImpl (double[] copy) - { - super (copy.length * 8, copy.length * 8, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - private static native double nio_get_Double (ByteBufferImpl b, int index, int limit); private static native void nio_put_Double (ByteBufferImpl b, int index, int limit, double value); public DoubleBuffer asDoubleBuffer () { - DoubleBufferImpl res = new DoubleBufferImpl (backing_buffer); - res.limit ((limit () * 8) / 1); - return res; + throw new Error ("Not implemented"); } public boolean isReadOnly() diff --git a/libjava/gnu/java/nio/CharBufferImpl.java b/libjava/gnu/java/nio/CharBufferImpl.java index f35ae4b09ff..ca769742cca 100644 --- a/libjava/gnu/java/nio/CharBufferImpl.java +++ b/libjava/gnu/java/nio/CharBufferImpl.java @@ -72,25 +72,6 @@ public final class CharBufferImpl extends CharBuffer private static native char[] nio_cast (byte[] copy); - CharBufferImpl (byte[] copy) - { - super (copy.length / 2, copy.length / 2, 0, 0); - this.backing_buffer = (copy != null ? nio_cast (copy) : null); - readOnly = false; - } - - private static native byte nio_get_Byte (CharBufferImpl b, int index, int limit); - - private static native void nio_put_Byte (CharBufferImpl b, int index, int limit, byte value); - - public ByteBuffer asByteBuffer () - { - ByteBufferImpl res = new ByteBufferImpl (backing_buffer); - res.limit ((limit () * 1) / 2); - return res; - } - - public boolean isReadOnly() { return readOnly; diff --git a/libjava/gnu/java/nio/DoubleBufferImpl.java b/libjava/gnu/java/nio/DoubleBufferImpl.java index f4dffc2d8f4..7d4f69311d0 100644 --- a/libjava/gnu/java/nio/DoubleBufferImpl.java +++ b/libjava/gnu/java/nio/DoubleBufferImpl.java @@ -70,26 +70,6 @@ public final class DoubleBufferImpl extends DoubleBuffer readOnly = copy.isReadOnly (); } - DoubleBufferImpl (byte[] copy) - { - super (copy.length, copy.length, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - - private static native byte nio_get_Byte (DoubleBufferImpl b, int index, int limit); - - private static native void nio_put_Byte (DoubleBufferImpl b, int index, int limit, byte value); - - public ByteBuffer asByteBuffer () - { - ByteBufferImpl res = new ByteBufferImpl (backing_buffer); - res.limit ((limit () * 1) / 8); - return res; - } - - private static native double[] nio_cast (byte[] copy); - public boolean isReadOnly () { return readOnly; diff --git a/libjava/gnu/java/nio/FloatBufferImpl.java b/libjava/gnu/java/nio/FloatBufferImpl.java index 6c77103bb2f..4acde80b747 100644 --- a/libjava/gnu/java/nio/FloatBufferImpl.java +++ b/libjava/gnu/java/nio/FloatBufferImpl.java @@ -70,26 +70,6 @@ public final class FloatBufferImpl extends FloatBuffer readOnly = copy.isReadOnly (); } - private static native float[] nio_cast (byte[] copy); - - FloatBufferImpl (byte[] copy) - { - super (copy.length, copy.length, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - - private static native byte nio_get_Byte (FloatBufferImpl b, int index, int limit); - - private static native void nio_put_Byte (FloatBufferImpl b, int index, int limit, byte value); - - public ByteBuffer asByteBuffer() - { - ByteBufferImpl res = new ByteBufferImpl (backing_buffer); - res.limit ((limit () * 1) / 4); - return res; - } - public boolean isReadOnly () { return readOnly; diff --git a/libjava/gnu/java/nio/IntBufferImpl.java b/libjava/gnu/java/nio/IntBufferImpl.java index d9f80636aa6..cfa3efe597a 100644 --- a/libjava/gnu/java/nio/IntBufferImpl.java +++ b/libjava/gnu/java/nio/IntBufferImpl.java @@ -70,26 +70,6 @@ public final class IntBufferImpl extends IntBuffer readOnly = copy.isReadOnly (); } - private static native int[] nio_cast (byte[] copy); - - IntBufferImpl (byte[] copy) - { - super (copy.length, copy.length, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - - private static native byte nio_get_Byte (IntBufferImpl b, int index, int limit); - - private static native void nio_put_Byte (IntBufferImpl b, int index, int limit, byte value); - - public ByteBuffer asByteBuffer () - { - ByteBufferImpl res = new ByteBufferImpl (backing_buffer); - res.limit ((limit () * 1) / 4); - return res; - } - public boolean isReadOnly() { return readOnly; diff --git a/libjava/gnu/java/nio/LongBufferImpl.java b/libjava/gnu/java/nio/LongBufferImpl.java index e17f4870b09..8a295fa5a35 100644 --- a/libjava/gnu/java/nio/LongBufferImpl.java +++ b/libjava/gnu/java/nio/LongBufferImpl.java @@ -70,26 +70,6 @@ public final class LongBufferImpl extends LongBuffer readOnly = copy.isReadOnly (); } - private static native long[] nio_cast (byte[] copy); - - LongBufferImpl (byte[] copy) - { - super (copy.length, copy.length, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - - private static native byte nio_get_Byte (LongBufferImpl b, int index, int limit); - - private static native void nio_put_Byte (LongBufferImpl b, int index, int limit, byte value); - - public ByteBuffer asByteBuffer () - { - ByteBufferImpl res = new ByteBufferImpl (backing_buffer); - res.limit ((limit () * 1) / 8); - return res; - } - public boolean isReadOnly() { return readOnly; diff --git a/libjava/gnu/java/nio/ShortBufferImpl.java b/libjava/gnu/java/nio/ShortBufferImpl.java index e4c9a060539..c4f679b7ce8 100644 --- a/libjava/gnu/java/nio/ShortBufferImpl.java +++ b/libjava/gnu/java/nio/ShortBufferImpl.java @@ -70,26 +70,6 @@ public final class ShortBufferImpl extends ShortBuffer readOnly = copy.isReadOnly (); } - private static native short[] nio_cast (byte[] copy); - - ShortBufferImpl (byte[] copy) - { - super (copy.length, copy.length, 0, 0); - this.backing_buffer = copy != null ? nio_cast (copy) : null; - readOnly = false; - } - - private static native byte nio_get_Byte (ShortBufferImpl b, int index, int limit); - - private static native void nio_put_Byte (ShortBufferImpl b, int index, int limit, byte value); - - public ByteBuffer asByteBuffer () - { - ByteBufferImpl res = new ByteBufferImpl (backing_buffer); - res.limit ((limit () * 1) / 2); - return res; - } - public boolean isReadOnly() { return readOnly; diff --git a/libjava/gnu/java/nio/natByteBufferImpl.cc b/libjava/gnu/java/nio/natByteBufferImpl.cc index 2bb1e41a622..c6ba45669ff 100644 --- a/libjava/gnu/java/nio/natByteBufferImpl.cc +++ b/libjava/gnu/java/nio/natByteBufferImpl.cc @@ -15,53 +15,6 @@ details. */ #include -JArray* -gnu::java::nio::ByteBufferImpl::nio_cast(JArray*) -{ - return NULL; -} - -JArray* -gnu::java::nio::ByteBufferImpl::nio_cast(JArray*) -{ - return NULL; -} - -JArray* -gnu::java::nio::ByteBufferImpl::nio_cast(JArray*) -{ - return NULL; -} - -JArray* -gnu::java::nio::ByteBufferImpl::nio_cast(JArray*) -{ - return NULL; -} - -JArray* -gnu::java::nio::ByteBufferImpl::nio_cast(JArray*) -{ - return NULL; -} - -JArray* -gnu::java::nio::ByteBufferImpl::nio_cast(JArray*) -{ - return NULL; -} - -JArray* -gnu::java::nio::ByteBufferImpl::nio_cast(JArray*) -{ - return NULL; -} - -void -gnu::java::nio::ByteBufferImpl::nio_put_Byte(gnu::java::nio::ByteBufferImpl*, jint, jint, jbyte) -{ -} - void gnu::java::nio::ByteBufferImpl::nio_put_Char(gnu::java::nio::ByteBufferImpl*, jint, jint, jchar) { @@ -92,12 +45,6 @@ gnu::java::nio::ByteBufferImpl::nio_put_Double(gnu::java::nio::ByteBufferImpl*, { } -jbyte -gnu::java::nio::ByteBufferImpl::nio_get_Byte(gnu::java::nio::ByteBufferImpl*, jint, jint) -{ - return 0; -} - jchar gnu::java::nio::ByteBufferImpl::nio_get_Char(gnu::java::nio::ByteBufferImpl*, jint, jint) { diff --git a/libjava/gnu/java/nio/natCharBufferImpl.cc b/libjava/gnu/java/nio/natCharBufferImpl.cc index 9fb54e14561..eb729277d3a 100644 --- a/libjava/gnu/java/nio/natCharBufferImpl.cc +++ b/libjava/gnu/java/nio/natCharBufferImpl.cc @@ -20,14 +20,3 @@ gnu::java::nio::CharBufferImpl::nio_cast(JArray*) { return NULL; } - -void -gnu::java::nio::CharBufferImpl::nio_put_Byte(gnu::java::nio::CharBufferImpl*, jint, jint, jbyte) -{ -} - -jbyte -gnu::java::nio::CharBufferImpl::nio_get_Byte(gnu::java::nio::CharBufferImpl*, jint, jint) -{ - return 0; -} -- 2.30.2