UTF_16.java, [...]: Cleanup.

2004-10-16  Michael Koch  <konqueror@gmx.de>

	* libjava/gnu/java/nio/charset/UTF_16.java,
	libjava/gnu/java/nio/charset/UTF_16BE.java,
	libjava/gnu/java/nio/charset/UTF_16LE.java,
	libjava/java/nio/ByteOrder.java,
	libjava/java/nio/MappedByteBuffer.java,
	libjava/java/nio/channels/Channels.java,
	libjava/java/nio/channels/spi/SelectorProvider.java,
	libjava/java/nio/charset/Charset.java:
	Cleanup.

From-SVN: r89151

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 03a108fcdffe257581811592c82d04c05124c9d9..d16ebabd43da46ae61d1cbbf5a9db45c1c25befa 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2004-10-16  Michael Koch  <konqueror@gmx.de>
+
+       * libjava/gnu/java/nio/charset/UTF_16.java,
+       libjava/gnu/java/nio/charset/UTF_16BE.java,
+       libjava/gnu/java/nio/charset/UTF_16LE.java,
+       libjava/java/nio/ByteOrder.java,
+       libjava/java/nio/MappedByteBuffer.java,
+       libjava/java/nio/channels/Channels.java,
+       libjava/java/nio/channels/spi/SelectorProvider.java,
+       libjava/java/nio/charset/Charset.java:
+       Cleanup.
+
 2004-10-16  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/nio/charset/UTF_16Encoder.java

diff --git a/libjava/gnu/java/nio/charset/UTF_16.java b/libjava/gnu/java/nio/charset/UTF_16.java
index 18c9be7f4b2db8b2cbea3570a9e28bc42f54ff91..aebd14608bd6aca56c4a959f426b4bada63e05d4 100644 (file)
--- a/libjava/gnu/java/nio/charset/UTF_16.java
+++ b/libjava/gnu/java/nio/charset/UTF_16.java
@@ -1,5 +1,5 @@
 /* UTF_16.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,14 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.nio.charset;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
 
 /**
  * UTF-16 charset.

diff --git a/libjava/gnu/java/nio/charset/UTF_16BE.java b/libjava/gnu/java/nio/charset/UTF_16BE.java
index 6fb28cdf830faf7ee088da75f4faf6e966ba473a..efd84fe3fd989ec08117b02dd5d0dba583b1bc4f 100644 (file)
--- a/libjava/gnu/java/nio/charset/UTF_16BE.java
+++ b/libjava/gnu/java/nio/charset/UTF_16BE.java
@@ -1,5 +1,5 @@
 /* UTF_16BE.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,14 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.nio.charset;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
 
 /**
  * UTF-16BE charset.

diff --git a/libjava/gnu/java/nio/charset/UTF_16LE.java b/libjava/gnu/java/nio/charset/UTF_16LE.java
index b914ae072733121e0d59eddc0faa12eeb8057e06..6eafbbcc4f1ad9c7c4300ca3ded6fd0fddc60347 100644 (file)
--- a/libjava/gnu/java/nio/charset/UTF_16LE.java
+++ b/libjava/gnu/java/nio/charset/UTF_16LE.java
@@ -1,5 +1,5 @@
 /* UTF_16LE.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,14 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.nio.charset;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
 
 /**
  * UTF-16LE charset.

diff --git a/libjava/java/nio/ByteOrder.java b/libjava/java/nio/ByteOrder.java
index 671336af8dce1c11300aa31a1489cbdab9c4ceb4..25076bce70c52e63bfae3936fd584e6c0fd28057 100644 (file)
--- a/libjava/java/nio/ByteOrder.java
+++ b/libjava/java/nio/ByteOrder.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package java.nio;
 
-import gnu.classpath.Configuration;
-
 /**
  * @author Michael Koch
  * @since 1.4

diff --git a/libjava/java/nio/MappedByteBuffer.java b/libjava/java/nio/MappedByteBuffer.java
index 29b0453cbba603f4413e05de18696a644aef0f9e..1b184963ba342d4bda813135495bd541303b3f23 100644 (file)
--- a/libjava/java/nio/MappedByteBuffer.java
+++ b/libjava/java/nio/MappedByteBuffer.java
@@ -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 @@ exception statement from your version. */
 package java.nio;
 
 /**
- * @author Michael Koch
+ * @author Michael Koch (konqueror@gmx.de)
  * @since 1.4
  */
 public abstract class MappedByteBuffer extends ByteBuffer

diff --git a/libjava/java/nio/channels/Channels.java b/libjava/java/nio/channels/Channels.java
index 9eb2ec7bff60715f6328f013706beef2f5d9ff66..9b446e461a99403f0c924433bd64d7bdb2880bd9 100644 (file)
--- a/libjava/java/nio/channels/Channels.java
+++ b/libjava/java/nio/channels/Channels.java
@@ -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.ChannelOutputStream;
 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;

diff --git a/libjava/java/nio/channels/spi/SelectorProvider.java b/libjava/java/nio/channels/spi/SelectorProvider.java
index ac6e124704dd234af607c221c8f760f0f090d549..99b33545c56ce344bb4250df3dafa43f2c4c983c 100644 (file)
--- a/libjava/java/nio/channels/spi/SelectorProvider.java
+++ b/libjava/java/nio/channels/spi/SelectorProvider.java
@@ -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 @@ exception statement from your version. */
 package java.nio.channels.spi;
 
 import gnu.java.nio.SelectorProviderImpl;
+
 import java.io.IOException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.Pipe;

diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java
index e0f27e6e697025f39c47708afdfd06a260da8483..ad570409a043d7f0dae2ab736818652f20622701 100644 (file)
--- a/libjava/java/nio/charset/Charset.java
+++ b/libjava/java/nio/charset/Charset.java
@@ -35,8 +35,11 @@ this exception to your version of the library, but you are not
 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;
+
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.spi.CharsetProvider;
@@ -47,7 +50,6 @@ import java.util.Locale;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import gnu.java.nio.charset.Provider;
 
 /**
  * @author Jesse Rosenstock
@@ -121,6 +123,8 @@ public abstract class Charset implements Comparable
     Charset cs = charsetForName (charsetName);
     if (cs == null)
       throw new UnsupportedCharsetException (charsetName);
+    cachedDecoder = null;
+    cachedEncoder = null;
     return cs;
   }