aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog22
-rw-r--r--libjava/java/nio/CharBuffer.java4
-rw-r--r--libjava/java/nio/DoubleBuffer.java6
-rw-r--r--libjava/java/nio/FloatBuffer.java4
-rw-r--r--libjava/java/nio/IntBuffer.java4
-rw-r--r--libjava/java/nio/LongBuffer.java4
-rw-r--r--libjava/java/nio/ShortBuffer.java4
7 files changed, 35 insertions, 13 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 552fa5d..97b7ad0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,6 +1,28 @@
2003-05-10 Michael Koch <konqueror@gmx.de>
* java/nio/CharBuffer.java
+ (offset): Make it package-private.
+ (backing_buffer): Likewise.
+ * java/nio/DoubleBuffer.java
+ (offset): Make it package-private.
+ (backing_buffer): Likewise.
+ (put): Reformatted.
+ * java/nio/FloatBuffer.java
+ (offset): Make it package-private.
+ (backing_buffer): Likewise.
+ * java/nio/IntBuffer.java
+ (offset): Make it package-private.
+ (backing_buffer): Likewise.
+ * java/nio/LongBuffer.java
+ (offset): Make it package-private.
+ (backing_buffer): Likewise.
+ * java/nio/ShortBuffer.java
+ (offset): Make it package-private.
+ (backing_buffer): Likewise.
+
+2003-05-10 Michael Koch <konqueror@gmx.de>
+
+ * java/nio/CharBuffer.java
(put): Fixed precondtion check.
(toString): Make it work without backing array.
(put): Skip one level of method calling.
diff --git a/libjava/java/nio/CharBuffer.java b/libjava/java/nio/CharBuffer.java
index 5499707d..2158af0 100644
--- a/libjava/java/nio/CharBuffer.java
+++ b/libjava/java/nio/CharBuffer.java
@@ -45,8 +45,8 @@ import gnu.java.nio.CharBufferImpl;
public abstract class CharBuffer extends Buffer
implements Comparable, CharSequence
{
- protected int array_offset = 0;
- protected char [] backing_buffer;
+ int array_offset = 0;
+ char[] backing_buffer;
/**
* Allocates a new <code>CharBuffer</code> object with a given capacity.
diff --git a/libjava/java/nio/DoubleBuffer.java b/libjava/java/nio/DoubleBuffer.java
index 27f3a16..ef39ac1 100644
--- a/libjava/java/nio/DoubleBuffer.java
+++ b/libjava/java/nio/DoubleBuffer.java
@@ -41,8 +41,8 @@ import gnu.java.nio.DoubleBufferImpl;
public abstract class DoubleBuffer extends Buffer implements Comparable
{
- protected double [] backing_buffer;
- protected int array_offset;
+ int array_offset;
+ double[] backing_buffer;
public static DoubleBuffer allocateDirect(int capacity)
{
@@ -108,7 +108,7 @@ public abstract class DoubleBuffer extends Buffer implements Comparable
public DoubleBuffer put (double[] src, int offset, int length)
{
for (int i = offset; i < offset + length; i++)
- put(src[i]);
+ put (src [i]);
return this;
}
diff --git a/libjava/java/nio/FloatBuffer.java b/libjava/java/nio/FloatBuffer.java
index 16c92d6..81feb45 100644
--- a/libjava/java/nio/FloatBuffer.java
+++ b/libjava/java/nio/FloatBuffer.java
@@ -41,8 +41,8 @@ import gnu.java.nio.FloatBufferImpl;
public abstract class FloatBuffer extends Buffer implements Comparable
{
- protected float [] backing_buffer;
- protected int array_offset;
+ int array_offset;
+ float[] backing_buffer;
public static FloatBuffer allocateDirect(int capacity)
{
diff --git a/libjava/java/nio/IntBuffer.java b/libjava/java/nio/IntBuffer.java
index 18e353b..295ad6a 100644
--- a/libjava/java/nio/IntBuffer.java
+++ b/libjava/java/nio/IntBuffer.java
@@ -41,8 +41,8 @@ import gnu.java.nio.IntBufferImpl;
public abstract class IntBuffer extends Buffer implements Comparable
{
- protected int [] backing_buffer;
- protected int array_offset;
+ int array_offset;
+ int[] backing_buffer;
public static IntBuffer allocateDirect(int capacity)
{
diff --git a/libjava/java/nio/LongBuffer.java b/libjava/java/nio/LongBuffer.java
index 8b73719..3597854 100644
--- a/libjava/java/nio/LongBuffer.java
+++ b/libjava/java/nio/LongBuffer.java
@@ -41,8 +41,8 @@ import gnu.java.nio.LongBufferImpl;
public abstract class LongBuffer extends Buffer implements Comparable
{
- protected long [] backing_buffer;
- protected int array_offset;
+ int array_offset;
+ long[] backing_buffer;
public static LongBuffer allocateDirect(int capacity)
{
diff --git a/libjava/java/nio/ShortBuffer.java b/libjava/java/nio/ShortBuffer.java
index 8c5915d..5e449f8 100644
--- a/libjava/java/nio/ShortBuffer.java
+++ b/libjava/java/nio/ShortBuffer.java
@@ -41,8 +41,8 @@ import gnu.java.nio.ShortBufferImpl;
public abstract class ShortBuffer extends Buffer implements Comparable
{
- protected short [] backing_buffer;
- protected int array_offset;
+ int array_offset;
+ short[] backing_buffer;
public static ShortBuffer allocateDirect(int capacity)
{