[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fixes for nio from ito and michael koch

Kaffe CVS cvs-commits at kaffe.org
Wed Jan 5 15:14:30 PST 2005


PatchSet 5776 
Date: 2005/01/05 23:09:49
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fixes for nio from ito and michael koch

Members: 
	ChangeLog:1.3320->1.3321 
	libraries/javalib/java/nio/ByteBufferImpl.java:1.9->1.10 
	libraries/javalib/java/nio/CharBufferImpl.java:1.7->1.8 
	libraries/javalib/java/nio/CharViewBufferImpl.java:1.3->1.4 
	libraries/javalib/java/nio/DirectByteBufferImpl.java:1.12->1.13 
	libraries/javalib/java/nio/DoubleBufferImpl.java:1.7->1.8 
	libraries/javalib/java/nio/DoubleViewBufferImpl.java:1.4->1.5 
	libraries/javalib/java/nio/FloatBufferImpl.java:1.7->1.8 
	libraries/javalib/java/nio/FloatViewBufferImpl.java:1.4->1.5 
	libraries/javalib/java/nio/IntBufferImpl.java:1.7->1.8 
	libraries/javalib/java/nio/IntViewBufferImpl.java:1.4->1.5 
	libraries/javalib/java/nio/LongBufferImpl.java:1.7->1.8 
	libraries/javalib/java/nio/LongViewBufferImpl.java:1.4->1.5 
	libraries/javalib/java/nio/MappedByteBufferImpl.java:1.10->1.11 
	libraries/javalib/java/nio/ShortBufferImpl.java:1.7->1.8 
	libraries/javalib/java/nio/ShortViewBufferImpl.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3320 kaffe/ChangeLog:1.3321
--- kaffe/ChangeLog:1.3320	Wed Jan  5 23:02:34 2005
+++ kaffe/ChangeLog	Wed Jan  5 23:09:49 2005
@@ -2,6 +2,32 @@
 
 	Resynced with GNU Classpath.
 
+	2004-12-30  Ito Kazumitsu  <kaz at maczuka.gcd.org>
+
+	* java/nio/ByteBufferImpl.java (compact):
+	Set position and limit even if no bytes were moved.
+
+	2004-12-30  Michael Koch  <konqueror at gmx.de>
+
+	* java/nio/CharViewBufferImpl.java (compact): Likewise.
+	* java/nio/DirectByteBufferImpl.java (compact): Likewise.
+	* java/nio/DoubleViewBufferImpl.java (compact): Likewise.
+	* java/nio/FloatViewBufferImpl.java (compact): Likewise.
+	* java/nio/IntViewBufferImpl.java (compact): Likewise.
+	* java/nio/LongViewBufferImpl.java (compact): Likewise.
+	* java/nio/MappedByteBufferImpl.java (compact): Likewise.
+	* java/nio/ShortViewBufferImpl.java (compact): Likewise.
+	* java/nio/FloatBufferImpl.java (compact): Set position.
+	* java/nio/CharBufferImpl.java (compact): Likewise.
+	* java/nio/DoubleBufferImpl.java (compact): Likewise.
+	* java/nio/IntBufferImpl.java (compact): Likewise.
+	* java/nio/LongBufferImpl.java (compact): Likewise.
+	* java/nio/ShortBufferImpl.java (compact): Likewise.
+	
+2005-01-05  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2004-12-30  Michael Koch  <konqueror at gmx.de>
 
 	* javax/swing/JFormattedTextField.java
Index: kaffe/libraries/javalib/java/nio/ByteBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.9 kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.10
--- kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.9	Wed Jan  5 19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/ByteBufferImpl.java	Wed Jan  5 23:09:52 2005
@@ -122,6 +122,11 @@
 	position(count);
 	limit(capacity());
       }
+    else
+      {
+	position(limit());
+	limit(capacity());
+      }
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/CharBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.7 kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.8
--- kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.7	Wed Jan  5 19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/CharBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -98,6 +98,7 @@
       }
 
     position (copied);
+    limit(capacity());
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/CharViewBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/CharViewBufferImpl.java:1.3 kaffe/libraries/javalib/java/nio/CharViewBufferImpl.java:1.4
--- kaffe/libraries/javalib/java/nio/CharViewBufferImpl.java:1.3	Tue Jun 15 17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/CharViewBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -118,6 +118,11 @@
         position (count);
         limit (capacity ());
       }
+    else
+      {
+	position(limit());
+	limit(capacity());
+      }
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.12 kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.13
--- kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.12	Wed Jan  5 20:08:56 2005
+++ kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -198,6 +198,11 @@
 	position(count);
 	limit(capacity());
       }
+    else
+      {
+	position(limit());
+	limit(capacity());
+      }
     return this;
   }
 
Index: kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java:1.7 kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java:1.8
--- kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java:1.7	Wed Jan  5 19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -91,6 +91,7 @@
       }
 
     position (copied);
+    limit(capacity());
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/DoubleViewBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/DoubleViewBufferImpl.java:1.4 kaffe/libraries/javalib/java/nio/DoubleViewBufferImpl.java:1.5
--- kaffe/libraries/javalib/java/nio/DoubleViewBufferImpl.java:1.4	Tue Jun 15 17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/DoubleViewBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -116,6 +116,11 @@
         position (count);
         limit (capacity ());
       }
+    else
+      {
+	position(limit());
+	limit(capacity());
+      }
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/FloatBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/FloatBufferImpl.java:1.7 kaffe/libraries/javalib/java/nio/FloatBufferImpl.java:1.8
--- kaffe/libraries/javalib/java/nio/FloatBufferImpl.java:1.7	Wed Jan  5 19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/FloatBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -91,6 +91,7 @@
       }
 
     position (copied);
+    limit(capacity());
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/FloatViewBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/FloatViewBufferImpl.java:1.4 kaffe/libraries/javalib/java/nio/FloatViewBufferImpl.java:1.5
--- kaffe/libraries/javalib/java/nio/FloatViewBufferImpl.java:1.4	Tue Jun 15 17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/FloatViewBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -116,6 +116,11 @@
         position (count);
         limit (capacity ());
       }
+    else
+      {
+	position(limit());
+	limit(capacity());
+      }
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/IntBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/IntBufferImpl.java:1.7 kaffe/libraries/javalib/java/nio/IntBufferImpl.java:1.8
--- kaffe/libraries/javalib/java/nio/IntBufferImpl.java:1.7	Wed Jan  5 19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/IntBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -91,6 +91,7 @@
       }
 
     position (copied);
+    limit(capacity());
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/IntViewBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/IntViewBufferImpl.java:1.4 kaffe/libraries/javalib/java/nio/IntViewBufferImpl.java:1.5
--- kaffe/libraries/javalib/java/nio/IntViewBufferImpl.java:1.4	Tue Jun 15 17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/IntViewBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -116,6 +116,11 @@
         position (count);
         limit (capacity ());
       }
+    else
+      {
+	position(limit());
+	limit(capacity());
+      }
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/LongBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/LongBufferImpl.java:1.7 kaffe/libraries/javalib/java/nio/LongBufferImpl.java:1.8
--- kaffe/libraries/javalib/java/nio/LongBufferImpl.java:1.7	Wed Jan  5 19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/LongBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -91,6 +91,7 @@
       }
 
     position (copied);
+    limit(capacity());
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/LongViewBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/LongViewBufferImpl.java:1.4 kaffe/libraries/javalib/java/nio/LongViewBufferImpl.java:1.5
--- kaffe/libraries/javalib/java/nio/LongViewBufferImpl.java:1.4	Tue Jun 15 17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/LongViewBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -116,6 +116,11 @@
         position (count);
         limit (capacity ());
       }
+    else
+      {
+	position(limit());
+	limit(capacity());
+      }
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java:1.10 kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java:1.11
--- kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java:1.10	Wed Jan  5 19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -129,6 +129,11 @@
 	position(count);
 	limit(capacity());
       }
+    else
+      {
+	position(limit());
+	limit(capacity());
+      }
     return this;
   }
 
Index: kaffe/libraries/javalib/java/nio/ShortBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/ShortBufferImpl.java:1.7 kaffe/libraries/javalib/java/nio/ShortBufferImpl.java:1.8
--- kaffe/libraries/javalib/java/nio/ShortBufferImpl.java:1.7	Wed Jan  5 19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/ShortBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -91,6 +91,7 @@
       }
 
     position (copied);
+    limit(capacity());
     return this;
   }
   
Index: kaffe/libraries/javalib/java/nio/ShortViewBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/ShortViewBufferImpl.java:1.4 kaffe/libraries/javalib/java/nio/ShortViewBufferImpl.java:1.5
--- kaffe/libraries/javalib/java/nio/ShortViewBufferImpl.java:1.4	Tue Jun 15 17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/ShortViewBufferImpl.java	Wed Jan  5 23:09:53 2005
@@ -116,6 +116,11 @@
         position (count);
         limit (capacity ());
       }
+    else
+      {
+	position(limit());
+	limit(capacity());
+      }
     return this;
   }
   




More information about the kaffe mailing list