Commit 2c478ce3 by Michael Koch Committed by Michael Koch

2003-05-09 Michael Koch <konqueror@gmx.de>

	* 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
parent 44db872c
2003-05-09 Michael Koch <konqueror@gmx.de> 2003-05-09 Michael Koch <konqueror@gmx.de>
* 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 <konqueror@gmx.de>
* java/net/JarURLConnection.java * java/net/JarURLConnection.java
(getJarEntry): Merged documentation from classpath. (getJarEntry): Merged documentation from classpath.
(getJarFile): Likewise. (getJarFile): Likewise.
......
...@@ -79,138 +79,58 @@ public final class ByteBufferImpl extends ByteBuffer ...@@ -79,138 +79,58 @@ public final class ByteBufferImpl extends ByteBuffer
position (position () + toAdd); 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 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); private static native void nio_put_Char (ByteBufferImpl b, int index, int limit, char value);
public CharBuffer asCharBuffer () public CharBuffer asCharBuffer ()
{ {
CharBufferImpl res = new CharBufferImpl (backing_buffer); throw new Error ("Not implemented");
res.limit ((limit () * 2) / 1);
return res;
} }
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 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); private static native void nio_put_Short (ByteBufferImpl b, int index, int limit, short value);
public ShortBuffer asShortBuffer () public ShortBuffer asShortBuffer ()
{ {
ShortBufferImpl res = new ShortBufferImpl (backing_buffer); throw new Error ("Not implemented");
res.limit ((limit () * 2) / 1);
return res;
} }
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 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); private static native void nio_put_Int (ByteBufferImpl b, int index, int limit, int value);
public IntBuffer asIntBuffer () public IntBuffer asIntBuffer ()
{ {
IntBufferImpl res = new IntBufferImpl (backing_buffer); throw new Error ("Not implemented");
res.limit ((limit() * 4) / 1);
return res;
} }
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 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); private static native void nio_put_Long (ByteBufferImpl b, int index, int limit, long value);
public LongBuffer asLongBuffer () public LongBuffer asLongBuffer ()
{ {
LongBufferImpl res = new LongBufferImpl (backing_buffer); throw new Error ("Not implemented");
res.limit ((limit() * 8) / 1);
return res;
} }
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 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); private static native void nio_put_Float (ByteBufferImpl b, int index, int limit, float value);
public FloatBuffer asFloatBuffer () public FloatBuffer asFloatBuffer ()
{ {
FloatBufferImpl res = new FloatBufferImpl (backing_buffer); throw new Error ("Not implemented");
res.limit ((limit() * 4) / 1);
return res;
} }
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 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); private static native void nio_put_Double (ByteBufferImpl b, int index, int limit, double value);
public DoubleBuffer asDoubleBuffer () public DoubleBuffer asDoubleBuffer ()
{ {
DoubleBufferImpl res = new DoubleBufferImpl (backing_buffer); throw new Error ("Not implemented");
res.limit ((limit () * 8) / 1);
return res;
} }
public boolean isReadOnly() public boolean isReadOnly()
......
...@@ -72,25 +72,6 @@ public final class CharBufferImpl extends CharBuffer ...@@ -72,25 +72,6 @@ public final class CharBufferImpl extends CharBuffer
private static native char[] nio_cast (byte[] copy); 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() public boolean isReadOnly()
{ {
return readOnly; return readOnly;
......
...@@ -70,26 +70,6 @@ public final class DoubleBufferImpl extends DoubleBuffer ...@@ -70,26 +70,6 @@ public final class DoubleBufferImpl extends DoubleBuffer
readOnly = copy.isReadOnly (); 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 () public boolean isReadOnly ()
{ {
return readOnly; return readOnly;
......
...@@ -70,26 +70,6 @@ public final class FloatBufferImpl extends FloatBuffer ...@@ -70,26 +70,6 @@ public final class FloatBufferImpl extends FloatBuffer
readOnly = copy.isReadOnly (); 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 () public boolean isReadOnly ()
{ {
return readOnly; return readOnly;
......
...@@ -70,26 +70,6 @@ public final class IntBufferImpl extends IntBuffer ...@@ -70,26 +70,6 @@ public final class IntBufferImpl extends IntBuffer
readOnly = copy.isReadOnly (); 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() public boolean isReadOnly()
{ {
return readOnly; return readOnly;
......
...@@ -70,26 +70,6 @@ public final class LongBufferImpl extends LongBuffer ...@@ -70,26 +70,6 @@ public final class LongBufferImpl extends LongBuffer
readOnly = copy.isReadOnly (); 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() public boolean isReadOnly()
{ {
return readOnly; return readOnly;
......
...@@ -70,26 +70,6 @@ public final class ShortBufferImpl extends ShortBuffer ...@@ -70,26 +70,6 @@ public final class ShortBufferImpl extends ShortBuffer
readOnly = copy.isReadOnly (); 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() public boolean isReadOnly()
{ {
return readOnly; return readOnly;
......
...@@ -15,53 +15,6 @@ details. */ ...@@ -15,53 +15,6 @@ details. */
#include <gnu/java/nio/ByteBufferImpl.h> #include <gnu/java/nio/ByteBufferImpl.h>
JArray<jbyte>*
gnu::java::nio::ByteBufferImpl::nio_cast(JArray<jbyte>*)
{
return NULL;
}
JArray<jbyte>*
gnu::java::nio::ByteBufferImpl::nio_cast(JArray<jshort>*)
{
return NULL;
}
JArray<jbyte>*
gnu::java::nio::ByteBufferImpl::nio_cast(JArray<jint>*)
{
return NULL;
}
JArray<jbyte>*
gnu::java::nio::ByteBufferImpl::nio_cast(JArray<jlong>*)
{
return NULL;
}
JArray<jbyte>*
gnu::java::nio::ByteBufferImpl::nio_cast(JArray<jchar>*)
{
return NULL;
}
JArray<jbyte>*
gnu::java::nio::ByteBufferImpl::nio_cast(JArray<jfloat>*)
{
return NULL;
}
JArray<jbyte>*
gnu::java::nio::ByteBufferImpl::nio_cast(JArray<jdouble>*)
{
return NULL;
}
void
gnu::java::nio::ByteBufferImpl::nio_put_Byte(gnu::java::nio::ByteBufferImpl*, jint, jint, jbyte)
{
}
void void
gnu::java::nio::ByteBufferImpl::nio_put_Char(gnu::java::nio::ByteBufferImpl*, jint, jint, jchar) 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*, ...@@ -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 jchar
gnu::java::nio::ByteBufferImpl::nio_get_Char(gnu::java::nio::ByteBufferImpl*, jint, jint) gnu::java::nio::ByteBufferImpl::nio_get_Char(gnu::java::nio::ByteBufferImpl*, jint, jint)
{ {
......
...@@ -20,14 +20,3 @@ gnu::java::nio::CharBufferImpl::nio_cast(JArray<jbyte>*) ...@@ -20,14 +20,3 @@ gnu::java::nio::CharBufferImpl::nio_cast(JArray<jbyte>*)
{ {
return NULL; 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;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment