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, 73 insertions, 88 deletions

diff --git a/libjava/java/nio/MappedByteBufferImpl.java b/libjava/java/nio/MappedByteBufferImpl.java
index c5b460e..47673c6 100644
--- a/libjava/java/nio/MappedByteBufferImpl.java
+++ b/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);
   }
 }