[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: import
cleanup in java.nio
Kaffe CVS
cvs-commits at kaffe.org
Fri Oct 15 06:46:28 PDT 2004
PatchSet 5295
Date: 2004/10/15 13:41:49
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: import cleanup in java.nio
2004-10-15 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/nio/ByteOrder.java,
libraries/javalib/java/nio/MappedByteBuffer.java,
libraries/javalib/java/nio/MappedByteBufferImpl.java,
libraries/javalib/java/nio/channels/Channels.java,
libraries/javalib/java/nio/channels/spi/SelectorProvider.java,
libraries/javalib/java/nio/charset/Charset.java:
Resynced with GNU Classpath.
2004-10-15 Michael Koch <konqueror at gmx.de>
* java/nio/ByteOrder.java,
java/nio/MappedByteBuffer.java,
java/nio/MappedByteBufferImpl.java,
java/nio/channels/Channels.java,
java/nio/channels/spi/SelectorProvider.java,
java/nio/charset/Charset.java:
Cleanup.
Members:
ChangeLog:1.2847->1.2848
libraries/javalib/java/nio/ByteOrder.java:1.7->1.8
libraries/javalib/java/nio/MappedByteBuffer.java:1.7->1.8
libraries/javalib/java/nio/MappedByteBufferImpl.java:1.7->1.8
libraries/javalib/java/nio/channels/Channels.java:1.6->1.7
libraries/javalib/java/nio/channels/spi/SelectorProvider.java:1.6->1.7
libraries/javalib/java/nio/charset/Charset.java:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2847 kaffe/ChangeLog:1.2848
--- kaffe/ChangeLog:1.2847 Fri Oct 15 13:28:13 2004
+++ kaffe/ChangeLog Fri Oct 15 13:41:49 2004
@@ -1,5 +1,25 @@
2004-10-15 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/java/nio/ByteOrder.java,
+ libraries/javalib/java/nio/MappedByteBuffer.java,
+ libraries/javalib/java/nio/MappedByteBufferImpl.java,
+ libraries/javalib/java/nio/channels/Channels.java,
+ libraries/javalib/java/nio/channels/spi/SelectorProvider.java,
+ libraries/javalib/java/nio/charset/Charset.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-15 Michael Koch <konqueror at gmx.de>
+
+ * java/nio/ByteOrder.java,
+ java/nio/MappedByteBuffer.java,
+ java/nio/MappedByteBufferImpl.java,
+ java/nio/channels/Channels.java,
+ java/nio/channels/spi/SelectorProvider.java,
+ java/nio/charset/Charset.java:
+ Cleanup.
+
+2004-10-15 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/java/awt/image/ByteLookupTable.java,
libraries/javalib/java/awt/image/ShortLookupTable.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/java/nio/ByteOrder.java
diff -u kaffe/libraries/javalib/java/nio/ByteOrder.java:1.7 kaffe/libraries/javalib/java/nio/ByteOrder.java:1.8
--- kaffe/libraries/javalib/java/nio/ByteOrder.java:1.7 Mon Jul 26 21:13:57 2004
+++ kaffe/libraries/javalib/java/nio/ByteOrder.java Fri Oct 15 13:41:51 2004
@@ -38,8 +38,6 @@
package java.nio;
-import gnu.classpath.Configuration;
-
/**
* @author Michael Koch
* @since 1.4
Index: kaffe/libraries/javalib/java/nio/MappedByteBuffer.java
diff -u kaffe/libraries/javalib/java/nio/MappedByteBuffer.java:1.7 kaffe/libraries/javalib/java/nio/MappedByteBuffer.java:1.8
--- kaffe/libraries/javalib/java/nio/MappedByteBuffer.java:1.7 Mon Apr 12 11:40:28 2004
+++ kaffe/libraries/javalib/java/nio/MappedByteBuffer.java Fri Oct 15 13:41:52 2004
@@ -1,5 +1,5 @@
/* MappedByteBuffer.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,7 +39,7 @@
package java.nio;
/**
- * @author Michael Koch
+ * @author Michael Koch (konqueror at gmx.de)
* @since 1.4
*/
public abstract class MappedByteBuffer extends ByteBuffer
@@ -85,5 +85,9 @@
forceImpl();
}
- public void finalize () { unmapImpl(); }
+ public void finalize()
+ throws Throwable
+ {
+ unmapImpl();
+ }
}
Index: kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java:1.7 kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java:1.8
--- kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java:1.7 Tue Jun 15 17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java Fri Oct 15 13:41:52 2004
@@ -38,8 +38,9 @@
package java.nio;
-import java.io.IOException;
import gnu.classpath.RawData;
+
+import java.io.IOException;
final class MappedByteBufferImpl extends MappedByteBuffer
{
Index: kaffe/libraries/javalib/java/nio/channels/Channels.java
diff -u kaffe/libraries/javalib/java/nio/channels/Channels.java:1.6 kaffe/libraries/javalib/java/nio/channels/Channels.java:1.7
--- kaffe/libraries/javalib/java/nio/channels/Channels.java:1.6 Mon Apr 12 11:40:29 2004
+++ kaffe/libraries/javalib/java/nio/channels/Channels.java Fri Oct 15 13:41:52 2004
@@ -1,5 +1,5 @@
/* Channels.java --
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -42,6 +42,7 @@
import gnu.java.nio.InputStreamChannel;
import gnu.java.nio.OutputStreamChannel;
import gnu.java.nio.channels.FileChannelImpl;
+
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
Index: kaffe/libraries/javalib/java/nio/channels/spi/SelectorProvider.java
diff -u kaffe/libraries/javalib/java/nio/channels/spi/SelectorProvider.java:1.6 kaffe/libraries/javalib/java/nio/channels/spi/SelectorProvider.java:1.7
--- kaffe/libraries/javalib/java/nio/channels/spi/SelectorProvider.java:1.6 Mon Apr 12 11:40:32 2004
+++ kaffe/libraries/javalib/java/nio/channels/spi/SelectorProvider.java Fri Oct 15 13:41:52 2004
@@ -1,5 +1,5 @@
/* SelectorProvider.java
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
package java.nio.channels.spi;
import gnu.java.nio.SelectorProviderImpl;
+
import java.io.IOException;
import java.nio.channels.DatagramChannel;
import java.nio.channels.Pipe;
Index: kaffe/libraries/javalib/java/nio/charset/Charset.java
diff -u kaffe/libraries/javalib/java/nio/charset/Charset.java:1.4 kaffe/libraries/javalib/java/nio/charset/Charset.java:1.5
--- kaffe/libraries/javalib/java/nio/charset/Charset.java:1.4 Mon Mar 22 11:24:54 2004
+++ kaffe/libraries/javalib/java/nio/charset/Charset.java Fri Oct 15 13:41:53 2004
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.nio.charset;
import gnu.java.nio.charset.Provider;
More information about the kaffe
mailing list