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

libjava/ChangeLog

+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.
+
 2003-09-25  Bryce McKinlay  <bryce@mckinlay.net.nz>
 
 	* gnu/java/net/natPlainSocketImplWin32.cc: Add missing #includes.

libjava/java/nio/DirectByteBufferImpl.java

@@ -292,134 +292,56 @@ class DirectByteBufferImpl extends ByteBuffer
   
   final public ByteBuffer putLong (long value)
   {
-    // 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)
   {
-    // 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)
   {
-    // 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 ()
   {
-    // 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)
   {
-    // 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)
+  public final float getFloat (int index)
   {
-    // 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)
   {
-    // 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 ()
   {
-    // 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)
   {
-    // 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)
   {
-    // 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)
   {
-    // 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);
   }
 }

libjava/java/nio/MappedByteBufferImpl.java

@@ -58,6 +58,15 @@ public class MappedByteBufferImpl extends MappedByteBuffer
     limit ((int) si);
   }
 
+  public MappedByteBufferImpl (FileChannelImpl ch, int offset, int capacity, int limit, int position, int mark, boolean readOnly)
+  {
+    super (capacity, limit, position, mark);
+
+    this.ch = ch;
+    this.array_offset = offset;
+    this.readOnly = readOnly;
+  }
+  
   public boolean isReadOnly ()
   {
     return readOnly;
@@ -164,147 +173,123 @@ public class MappedByteBufferImpl extends MappedByteBuffer
     return new DoubleViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
   }
 
-  public char getChar ()
+  public final char getChar()
   {
-    char value = getChar (position());
-    position (position() + 2);
-    return value;
+    return ByteBufferHelper.getChar (this);
   }
-
-  public char getChar (int index)
+  
+  public final ByteBuffer putChar (char value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putChar (this, value);
   }
-
-  public ByteBuffer putChar (char value)
+  
+  public final char getChar (int index)
   {
-    putChar (position(), value);
-    position (position() + 2);
-    return this;
+    return ByteBufferHelper.getChar (this, index);
   }
-
-  public ByteBuffer putChar (int index, char value)
+  
+  public final ByteBuffer putChar (int index, char value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putChar (this, index, value);
   }
 
-  public double getDouble ()
+  public final short getShort()
   {
-    double value = getDouble (position());
-    position (position() + 8);
-    return value;
+    return ByteBufferHelper.getShort (this);
   }
-
-  public double getDouble (int index)
+  
+  public final ByteBuffer putShort (short value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putShort (this, value);
   }
-
-  public ByteBuffer putDouble (double value)
+  
+  public final short getShort (int index)
   {
-    putDouble (position(), value);
-    position (position() + 8);
-    return this;
+    return ByteBufferHelper.getShort (this, index);
   }
-
-  public ByteBuffer putDouble (int index, double value)
+  
+  public final ByteBuffer putShort (int index, short value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putShort (this, index, value);
   }
 
-  public float getFloat ()
+  public final int getInt()
   {
-    float value = getFloat (position ());
-    position (position() + 4);
-    return value;
+    return ByteBufferHelper.getInt (this);
   }
-
-  public float getFloat (int index)
+  
+  public final ByteBuffer putInt (int value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putInt (this, value);
   }
-
-  public ByteBuffer putFloat (float value)
+  
+  public final int getInt (int index)
   {
-    putFloat (position(), value);
-    position (position() + 4);
-    return this;
+    return ByteBufferHelper.getInt (this, index);
   }
-
-  public ByteBuffer putFloat (int index, float value)
+  
+  public final ByteBuffer putInt (int index, int value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putInt (this, index, value);
   }
 
-  public int getInt ()
+  public final long getLong()
   {
-    int value = getInt (position());
-    position (position() + 8);
-    return value;
+    return ByteBufferHelper.getLong (this);
   }
-
-  public int getInt (int index)
+  
+  public final ByteBuffer putLong (long value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putLong (this, value);
   }
-
-  public ByteBuffer putInt (int value)
+  
+  public final long getLong (int index)
   {
-    putInt (position(), value);
-    position (position() + 4);
-    return this;
+    return ByteBufferHelper.getLong (this, index);
   }
-
-  public ByteBuffer putInt (int index, int value)
+  
+  public final ByteBuffer putLong (int index, long value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putLong (this, index, value);
   }
 
-  public long getLong ()
+  public final float getFloat()
   {
-    long value = getLong (position());
-    position (position() + 8);
-    return value;
+    return ByteBufferHelper.getFloat (this);
   }
-
-  public long getLong (int index)
+  
+  public final ByteBuffer putFloat (float value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putFloat (this, value);
   }
-
-  public ByteBuffer putLong (long value)
+  
+  public final float getFloat (int index)
   {
-    putLong (position(), value);
-    position (position() + 8);
-    return this;
+    return ByteBufferHelper.getFloat (this, index);
   }
 
-  public ByteBuffer putLong (int index, long value)
+  public final ByteBuffer putFloat (int index, float value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putFloat (this, index, value);
   }
 
-  public short getShort ()
+  public final double getDouble()
   {
-    short value = getShort (position());
-    position (position() + 2);
-    return value;
+    return ByteBufferHelper.getDouble (this);
   }
 
-  public short getShort (int index)
+  public final ByteBuffer putDouble (double value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putDouble (this, value);
   }
-
-  public ByteBuffer putShort (short value)
+  
+  public final double getDouble (int index)
   {
-    putShort (position(), value);
-    position (position() + 2);
-    return this;
+    return ByteBufferHelper.getDouble (this, index);
   }
-
-  public ByteBuffer putShort (int index, short value)
+  
+  public final ByteBuffer putDouble (int index, double value)
   {
-    throw new Error ("Not implemented");
+    return ByteBufferHelper.putDouble (this, index, value);
   }
 }