ByteBufferHelper.java: New file.

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

	* java/nio/ByteBufferHelper.java:
	New file.
	* java/nio/ByteBufferImpl.java,
	java/nio/DirectByteBufferImpl.java,
	java/nio/MappedByteBufferImpl.java
	(getType,putType): Use new helper class ByteBufferHelper.
	* Makefile.am (ordinary_java_source_files):
	Added java/nio/ByteBufferHelper.java.
	* Makefile.in: Regenerated.

From-SVN: r71757

1 files changed, 25 insertions, 217 deletions

diff --git a/libjava/java/nio/ByteBufferImpl.java b/libjava/java/nio/ByteBufferImpl.java
index 7ea3a3a..76c965d 100644
--- a/libjava/java/nio/ByteBufferImpl.java
+++ b/libjava/java/nio/ByteBufferImpl.java
@@ -182,313 +182,121 @@ final class ByteBufferImpl extends ByteBuffer
   
   final public char getChar ()
   {
-    if (remaining() < 2)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (char) (((get () & 0xff) << 8)
-                   + (get () & 0xff));
+    return ByteBufferHelper.getChar (this);
   }
   
   final public ByteBuffer putChar (char value)
   {
-    if (remaining() < 2)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put ((byte) ((((int) value) & 0xff00) >> 8));
-    put ((byte) (((int) value) & 0x00ff));
-    return this;
+    return ByteBufferHelper.putChar (this, value);
   }
   
   final public char getChar (int index)
   {
-    if (remaining() < 2)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (char) (((get (index) & 0xff) << 8) + (get (index + 1) & 0xff));
+    return ByteBufferHelper.getChar (this, index);
   }
   
   final public ByteBuffer putChar (int index, char value)
   {
-    if (remaining() < 2)
-      throw new BufferOverflowException();
-    // FIXME: this handles little endian only
-    put (index, (byte) ((((int) value) & 0xff00) >> 8));
-    put (index + 1, (byte) (((int) value) & 0x00ff));
-    return this;
+    return ByteBufferHelper.putChar (this, index, value);
   }
 
   final public short getShort ()
   {
-    if (remaining() < 2)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (short) (((get () & 0xff) << 8) + (get () & 0xff));
+    return ByteBufferHelper.getShort (this);
   }
   
   final public ByteBuffer putShort (short value)
   {
-    if (remaining() < 2)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put ((byte) ((((int) value) & 0xff00) >> 8));
-    put ((byte) (((int) value) & 0x00ff));
-    return this;
+    return ByteBufferHelper.putShort (this, value);
   }
   
   final public short getShort (int index)
   {
-    if (remaining() < 2)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (short) (((get (index) & 0xff) << 8) + (get (index + 1) & 0xff));
+    return ByteBufferHelper.getShort (this, index);
   }
   
   final public ByteBuffer putShort (int index, short value)
   {
-    if (remaining() < 2)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put (index, (byte) ((((int) value) & 0xff00) >> 8));
-    put (index + 1, (byte) (((int) value) & 0x00ff));
-    return this;
+    return ByteBufferHelper.putShort (this, index, value);
   }
 
   final public int getInt ()
   {
-    if (remaining() < 4)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (int) (((get () & 0xff) << 24)
-                  + ((get () & 0xff) << 16)
-                  + ((get () & 0xff) << 8)
-                  + (get () & 0xff));
+    return ByteBufferHelper.getInt (this);
   }
   
   final public ByteBuffer putInt (int value)
   {
-    if (remaining() < 4)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put ((byte) ((value & 0xff000000) >> 24));
-    put ((byte) ((value & 0x00ff0000) >> 16));
-    put ((byte) ((value & 0x0000ff00) >> 8));
-    put ((byte) (value & 0x000000ff));
-    return this;
+    return ByteBufferHelper.putInt (this, value);
   }
   
   final public int getInt (int index)
   {
-    if (remaining() < 4)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (int) (((get (index) & 0xff) << 24)
-                  + ((get (index + 1) & 0xff) << 16)
-                  + ((get (index + 2) & 0xff) << 8)
-                  + (get (index + 3) & 0xff));
+    return ByteBufferHelper.getInt (this, index);
   }
   
   final public ByteBuffer putInt (int index, int value)
   {
-    if (remaining() < 4)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put (index, (byte) ((value & 0xff000000) >> 24));
-    put (index + 1, (byte) ((value & 0x00ff0000) >> 16));
-    put (index + 2, (byte) ((value & 0x0000ff00) >> 8));
-    put (index + 3, (byte) (value & 0x000000ff));
-    return this;
+    return ByteBufferHelper.putInt (this, index, value);
   }
 
   final public long getLong ()
   {
-    if (remaining() < 8)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (long) (((get () & 0xff) << 56)
-                   + ((get () & 0xff) << 48)
-                   + ((get () & 0xff) << 40)
-                   + ((get () & 0xff) << 32)
-                   + ((get () & 0xff) << 24)
-                   + ((get () & 0xff) << 16)
-                   + ((get () & 0xff) << 8)
-                   + (get () & 0xff));
+    return ByteBufferHelper.getLong (this);
   }
   
   final public ByteBuffer putLong (long value)
   {
-    if (remaining() < 8)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put ((byte) ((value & 0xff00000000000000L) >> 56));
-    put ((byte) ((value & 0x00ff000000000000L) >> 48));
-    put ((byte) ((value & 0x0000ff0000000000L) >> 40));
-    put ((byte) ((value & 0x000000ff00000000L) >> 32));
-    put ((byte) ((value & 0x00000000ff000000L) >> 24));
-    put ((byte) ((value & 0x0000000000ff0000L) >> 16));
-    put ((byte) ((value & 0x000000000000ff00L) >> 8));
-    put ((byte) (value & 0x00000000000000ffL));
-    return this;
+    return ByteBufferHelper.putLong (this, value);
   }
   
   final public long getLong (int index)
   {
-    if (remaining() < 8)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (long) (((get (index) & 0xff) << 56)
-                   + ((get (index + 1) & 0xff) << 48)
-                   + ((get (index + 2) & 0xff) << 40)
-                   + ((get (index + 3) & 0xff) << 32)
-                   + ((get (index + 4) & 0xff) << 24)
-                   + ((get (index + 5) & 0xff) << 16)
-                   + ((get (index + 6) & 0xff) << 8)
-                   + (get (index + 7) & 0xff));
+    return ByteBufferHelper.getLong (this, index);
   }
   
   final public ByteBuffer putLong (int index, long value)
   {
-    if (remaining() < 8)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put (index, (byte) ((value & 0xff00000000000000L) >> 56));
-    put (index + 1, (byte) ((value & 0x00ff000000000000L) >> 48));
-    put (index + 2, (byte) ((value & 0x0000ff0000000000L) >> 40));
-    put (index + 3, (byte) ((value & 0x000000ff00000000L) >> 32));
-    put (index + 4, (byte) ((value & 0x00000000ff000000L) >> 24));
-    put (index + 5, (byte) ((value & 0x0000000000ff0000L) >> 16));
-    put (index + 6, (byte) ((value & 0x000000000000ff00L) >> 8));
-    put (index + 7, (byte) (value & 0x00000000000000ffL));
-    return this;
+    return ByteBufferHelper.putLong (this, index, value);
   }
 
   final public float getFloat ()
   {
-    if (remaining() < 4)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (float) (((get () & 0xff) << 24)
-                    + ((get () & 0xff) << 16)
-                    + ((get () & 0xff) << 8)
-                    + (get () & 0xff));
+    return ByteBufferHelper.getFloat (this);
   }
   
   final public ByteBuffer putFloat (float value)
   {
-    if (remaining() < 4)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put ((byte) ((((int) value) & 0xff000000) >> 24));
-    put ((byte) ((((int) value) & 0x00ff0000) >> 16));
-    put ((byte) ((((int) value) & 0x0000ff00) >> 8));
-    put ((byte) (((int) value) & 0x000000ff));
-    return this;
+    return ByteBufferHelper.putFloat (this, value);
   }
   
   final public float getFloat (int index)
   {
-    if (remaining() < 4)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (float) (((get (index) & 0xff) << 24)
-                    + ((get (index + 1) & 0xff) << 16)
-                    + ((get (index + 2) & 0xff) << 8)
-                    + (get (index + 3) & 0xff));
+    return ByteBufferHelper.getFloat (this, index);
   }
 
-  final public ByteBuffer putFloat (int index, float value)
+  public final ByteBuffer putFloat (int index, float value)
   {
-    if (remaining() < 4)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put (index, (byte) ((((int) value) & 0xff000000) >> 24));
-    put (index + 1, (byte) ((((int) value) & 0x00ff0000) >> 16));
-    put (index + 2, (byte) ((((int) value) & 0x0000ff00) >> 8));
-    put (index + 3, (byte) (((int) value) & 0x000000ff));
-    return this;
+    return ByteBufferHelper.putFloat (this, index, value);
   }
 
   final public double getDouble ()
   {
-    if (remaining() < 8)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (double) (((get () & 0xff) << 56)
-                     + ((get () & 0xff) << 48)
-                     + ((get () & 0xff) << 40)
-                     + ((get () & 0xff) << 32)
-                     + ((get () & 0xff) << 24)
-                     + ((get () & 0xff) << 16)
-                     + ((get () & 0xff) << 8)
-                     + (get () & 0xff));
+    return ByteBufferHelper.getDouble (this);
   }
 
   final public ByteBuffer putDouble (double value)
   {
-    if (remaining() < 8)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put ((byte) ((((long) value) & 0xff00000000000000L) >> 56));
-    put ((byte) ((((long) value) & 0x00ff000000000000L) >> 48));
-    put ((byte) ((((long) value) & 0x0000ff0000000000L) >> 40));
-    put ((byte) ((((long) value) & 0x000000ff00000000L) >> 32));
-    put ((byte) ((((long) value) & 0x00000000ff000000L) >> 24));
-    put ((byte) ((((long) value) & 0x0000000000ff0000L) >> 16));
-    put ((byte) ((((long) value) & 0x000000000000ff00L) >> 8));
-    put ((byte) (((long) value) & 0x00000000000000ffL));
-    return this;
+    return ByteBufferHelper.putDouble (this, value);
   }
   
   final public double getDouble (int index)
   {
-    if (remaining() < 8)
-      throw new BufferUnderflowException();
-
-    // FIXME: this handles little endian only
-    return (double) (((get (index) & 0xff) << 56)
-                     + ((get (index + 1) & 0xff) << 48)
-                     + ((get (index + 2) & 0xff) << 40)
-                     + ((get (index + 3) & 0xff) << 32)
-                     + ((get (index + 4) & 0xff) << 24)
-                     + ((get (index + 5) & 0xff) << 16)
-                     + ((get (index + 6) & 0xff) << 8)
-                     + (get (index + 7) & 0xff));
+    return ByteBufferHelper.getDouble (this, index);
   }
   
   final public ByteBuffer putDouble (int index, double value)
   {
-    if (remaining() < 8)
-      throw new BufferOverflowException();
-
-    // FIXME: this handles little endian only
-    put (index, (byte) ((((long) value) & 0xff00000000000000L) >> 56));
-    put (index + 1, (byte) ((((long) value) & 0x00ff000000000000L) >> 48));
-    put (index + 2, (byte) ((((long) value) & 0x0000ff0000000000L) >> 40));
-    put (index + 3, (byte) ((((long) value) & 0x000000ff00000000L) >> 32));
-    put (index + 4, (byte) ((((long) value) & 0x00000000ff000000L) >> 24));
-    put (index + 5, (byte) ((((long) value) & 0x0000000000ff0000L) >> 16));
-    put (index + 6, (byte) ((((long) value) & 0x000000000000ff00L) >> 8));
-    put (index + 7, (byte) (((long) value) & 0x00000000000000ffL));
-    return this;
+    return ByteBufferHelper.putDouble (this, index, value);
   }
 }