This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

FYI: Patch: java.nio.*Buffer fixes

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I commited the attached patch to trunk to fix the buffers in java.nio.


Michael
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+vK+MWSOgCCdjSDsRAnh8AJ9WAmY/3eGF2FQ5y0j+5VkMjGK10ACcC3+N
N65u62ElQUt2VUhAj+7sA4Y=
=8H7O
-----END PGP SIGNATURE-----

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1885
diff -u -b -B -r1.1885 ChangeLog
--- ChangeLog	10 May 2003 07:41:58 -0000	1.1885
+++ ChangeLog	10 May 2003 07:48:35 -0000
@@ -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.
Index: java/nio/CharBuffer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/CharBuffer.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 CharBuffer.java
--- java/nio/CharBuffer.java	10 May 2003 07:41:59 -0000	1.9
+++ java/nio/CharBuffer.java	10 May 2003 07:48:35 -0000
@@ -45,8 +45,8 @@
 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.
Index: java/nio/DoubleBuffer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/DoubleBuffer.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 DoubleBuffer.java
--- java/nio/DoubleBuffer.java	19 Feb 2003 11:47:49 -0000	1.5
+++ java/nio/DoubleBuffer.java	10 May 2003 07:48:35 -0000
@@ -41,8 +41,8 @@
 
 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 DoubleBuffer put (double[] src, int offset, int length)
   {
     for (int i = offset; i < offset + length; i++)
-      put(src[i]);
+      put (src [i]);
 
     return this;
   }
Index: java/nio/FloatBuffer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/FloatBuffer.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 FloatBuffer.java
--- java/nio/FloatBuffer.java	19 Feb 2003 11:47:49 -0000	1.5
+++ java/nio/FloatBuffer.java	10 May 2003 07:48:35 -0000
@@ -41,8 +41,8 @@
 
 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)
   {
Index: java/nio/IntBuffer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/IntBuffer.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 IntBuffer.java
--- java/nio/IntBuffer.java	19 Feb 2003 11:47:49 -0000	1.5
+++ java/nio/IntBuffer.java	10 May 2003 07:48:35 -0000
@@ -41,8 +41,8 @@
 
 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)
   {
Index: java/nio/LongBuffer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/LongBuffer.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 LongBuffer.java
--- java/nio/LongBuffer.java	19 Feb 2003 11:47:49 -0000	1.5
+++ java/nio/LongBuffer.java	10 May 2003 07:48:35 -0000
@@ -41,8 +41,8 @@
 
 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)
   {
Index: java/nio/ShortBuffer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/ShortBuffer.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 ShortBuffer.java
--- java/nio/ShortBuffer.java	19 Feb 2003 11:47:49 -0000	1.5
+++ java/nio/ShortBuffer.java	10 May 2003 07:48:35 -0000
@@ -41,8 +41,8 @@
 
 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)
   {
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]