* java/nio/CharViewBufferImpl.java: New convenience constructor.

	Fix buggy call to super constructor.
	* java/nio/DoubleViewBufferImpl.java:  Likewise.
	* java/nio/FloatViewBufferImpl.java:  Likewise.
	* java/nio/IntViewBufferImpl.java:  Likewise.
	* java/nio/LongViewBufferImpl.java:  Likewise.
	* java/nio/ShortViewBufferImpl.java:  Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77917 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 42af297..5352ffa 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -12,6 +12,13 @@
        * java/nio/IntBuffer.java:  Likewise.
        * java/nio/LongBuffer.java:  Likewise.
        * java/nio/ShortBuffer.java:  Likewise.
+       * java/nio/CharViewBufferImpl.java:  New convenience constructor.
+       Fix buggy call to super constructor.
+       * java/nio/DoubleViewBufferImpl.java:  Likewise.
+       * java/nio/FloatViewBufferImpl.java:  Likewise.
+       * java/nio/IntViewBufferImpl.java:  Likewise.
+       * java/nio/LongViewBufferImpl.java:  Likewise.
+       * java/nio/ShortViewBufferImpl.java:  Likewise.
 
 2004-02-15  Ito Kazumitsu  <kaz@maczuka.gcd.org>
 

diff --git a/libjava/java/nio/CharViewBufferImpl.java b/libjava/java/nio/CharViewBufferImpl.java
index b1cc907..ee99cfb 100644 (file)
--- a/libjava/java/nio/CharViewBufferImpl.java
+++ b/libjava/java/nio/CharViewBufferImpl.java
@@ -46,11 +46,20 @@ class CharViewBufferImpl extends CharBuffer
   private boolean readOnly;
   private ByteOrder endian;
   
+  CharViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public CharViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                             int limit, int position, int mark,
                             boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 1, limit >> 1, position >> 1, mark >> 1);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;

diff --git a/libjava/java/nio/DoubleViewBufferImpl.java b/libjava/java/nio/DoubleViewBufferImpl.java
index ac27746..7df2f50 100644 (file)
--- a/libjava/java/nio/DoubleViewBufferImpl.java
+++ b/libjava/java/nio/DoubleViewBufferImpl.java
@@ -46,11 +46,20 @@ class DoubleViewBufferImpl extends DoubleBuffer
   private boolean readOnly;
   private ByteOrder endian;
   
+  DoubleViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public DoubleViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                                int limit, int position, int mark,
                                boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 3, limit >> 3, position >> 3, mark >> 3);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;

diff --git a/libjava/java/nio/FloatViewBufferImpl.java b/libjava/java/nio/FloatViewBufferImpl.java
index 88bc925..c4caf9b 100644 (file)
--- a/libjava/java/nio/FloatViewBufferImpl.java
+++ b/libjava/java/nio/FloatViewBufferImpl.java
@@ -46,11 +46,20 @@ class FloatViewBufferImpl extends FloatBuffer
   private boolean readOnly;
   private ByteOrder endian;
   
+  FloatViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public FloatViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                              int limit, int position, int mark,
                              boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 2, limit >> 2, position >> 2, mark >> 2);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;

diff --git a/libjava/java/nio/IntViewBufferImpl.java b/libjava/java/nio/IntViewBufferImpl.java
index 8e384c9..3c8e8e6 100644 (file)
--- a/libjava/java/nio/IntViewBufferImpl.java
+++ b/libjava/java/nio/IntViewBufferImpl.java
@@ -46,11 +46,20 @@ class IntViewBufferImpl extends IntBuffer
   private boolean readOnly;
   private ByteOrder endian;
   
+  IntViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public IntViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                            int limit, int position, int mark,
                            boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 2, limit >> 2, position >> 2, mark >> 2);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;

diff --git a/libjava/java/nio/LongViewBufferImpl.java b/libjava/java/nio/LongViewBufferImpl.java
index a405ec8..9765de9 100644 (file)
--- a/libjava/java/nio/LongViewBufferImpl.java
+++ b/libjava/java/nio/LongViewBufferImpl.java
@@ -46,11 +46,20 @@ class LongViewBufferImpl extends LongBuffer
   private boolean readOnly;
   private ByteOrder endian;
   
+  LongViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public LongViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                             int limit, int position, int mark,
                             boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 3, limit >> 3, position >> 3, mark >> 3);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;

diff --git a/libjava/java/nio/ShortViewBufferImpl.java b/libjava/java/nio/ShortViewBufferImpl.java
index b217f1c..04d7785 100644 (file)
--- a/libjava/java/nio/ShortViewBufferImpl.java
+++ b/libjava/java/nio/ShortViewBufferImpl.java
@@ -45,12 +45,21 @@ class ShortViewBufferImpl extends ShortBuffer
   private ByteBuffer bb;
   private boolean readOnly;
   private ByteOrder endian;
+
+  ShortViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
   
   public ShortViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                              int limit, int position, int mark,
                              boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 1, limit >> 1, position >> 1, mark >> 1);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;