diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 12 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/charset/UTF_16.java | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/charset/UTF_16BE.java | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/charset/UTF_16LE.java | 6 | ||||
| -rw-r--r-- | libjava/java/nio/ByteOrder.java | 2 | ||||
| -rw-r--r-- | libjava/java/nio/MappedByteBuffer.java | 4 | ||||
| -rw-r--r-- | libjava/java/nio/channels/Channels.java | 3 | ||||
| -rw-r--r-- | libjava/java/nio/channels/spi/SelectorProvider.java | 3 | ||||
| -rw-r--r-- | libjava/java/nio/charset/Charset.java | 6 |
9 files changed, 29 insertions, 19 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 03a108f..d16ebab 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,17 @@ 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 (UTF_16Encoder): Fixed maxBytesPerChar handling. diff --git a/libjava/gnu/java/nio/charset/UTF_16.java b/libjava/gnu/java/nio/charset/UTF_16.java index 18c9be7..aebd146 100644 --- 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 6fb28cd..efd84fe 100644 --- 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 b914ae0..6eafbbc 100644 --- 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 671336a..25076bc 100644 --- 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 29b0453..1b18496 100644 --- 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 9eb2ec7..9b446e4 100644 --- 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 ac6e124..99b3354 100644 --- 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 e0f27e6..ad57040 100644 --- 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; } |