procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Michael Koch 2004-10-16 18:06:03 +00:00 • committed by Michael Koch
parent 752ef8732d
commit d8d3480a29
9 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libjava/ChangeLog
View file

@ -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> 2004-10-16 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/charset/UTF_16Encoder.java * gnu/java/nio/charset/UTF_16Encoder.java

6
libjava/gnu/java/nio/charset/UTF_16.java
View file

@ -1,5 +1,5 @@
/* UTF_16.java -- /* 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. 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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio.charset; package gnu.java.nio.charset;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder; import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
/** /**
* UTF-16 charset. * UTF-16 charset.

6
libjava/gnu/java/nio/charset/UTF_16BE.java
View file

@ -1,5 +1,5 @@
/* UTF_16BE.java -- /* 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. 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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio.charset; package gnu.java.nio.charset;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder; import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
/** /**
* UTF-16BE charset. * UTF-16BE charset.

6
libjava/gnu/java/nio/charset/UTF_16LE.java
View file

@ -1,5 +1,5 @@
/* UTF_16LE.java -- /* 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. 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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio.charset; package gnu.java.nio.charset;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder; import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
/** /**
* UTF-16LE charset. * UTF-16LE charset.

2
libjava/java/nio/ByteOrder.java
View file

@ -38,8 +38,6 @@ exception statement from your version. */
package java.nio; package java.nio;
import gnu.classpath.Configuration;
/** /**
* @author Michael Koch * @author Michael Koch
* @since 1.4 * @since 1.4

4
libjava/java/nio/MappedByteBuffer.java
View file

@ -1,5 +1,5 @@
/* MappedByteBuffer.java -- /* MappedByteBuffer.java --
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -39,7 +39,7 @@ exception statement from your version. */
package java.nio; package java.nio;
/** /**
* @author Michael Koch * @author Michael Koch (konqueror@gmx.de)
* @since 1.4 * @since 1.4
*/ */
public abstract class MappedByteBuffer extends ByteBuffer public abstract class MappedByteBuffer extends ByteBuffer

3
libjava/java/nio/channels/Channels.java
View file

@ -1,5 +1,5 @@
/* Channels.java -- /* 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. 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.InputStreamChannel;
import gnu.java.nio.OutputStreamChannel; import gnu.java.nio.OutputStreamChannel;
import gnu.java.nio.channels.FileChannelImpl; import gnu.java.nio.channels.FileChannelImpl;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.InputStream; import java.io.InputStream;

3
libjava/java/nio/channels/spi/SelectorProvider.java
View file

@ -1,5 +1,5 @@
/* SelectorProvider.java /* 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. This file is part of GNU Classpath.
@ -38,6 +38,7 @@ exception statement from your version. */
package java.nio.channels.spi; package java.nio.channels.spi;
import gnu.java.nio.SelectorProviderImpl; import gnu.java.nio.SelectorProviderImpl;
import java.io.IOException; import java.io.IOException;
import java.nio.channels.DatagramChannel; import java.nio.channels.DatagramChannel;
import java.nio.channels.Pipe; import java.nio.channels.Pipe;

6
libjava/java/nio/charset/Charset.java
View file

@ -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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package java.nio.charset; package java.nio.charset;
import gnu.java.nio.charset.Provider;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.CharBuffer; import java.nio.CharBuffer;
import java.nio.charset.spi.CharsetProvider; import java.nio.charset.spi.CharsetProvider;
@ -47,7 +50,6 @@ import java.util.Locale;
import java.util.Set; import java.util.Set;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import gnu.java.nio.charset.Provider;
/** /**
* @author Jesse Rosenstock * @author Jesse Rosenstock
@ -121,6 +123,8 @@ public abstract class Charset implements Comparable
Charset cs = charsetForName (charsetName); Charset cs = charsetForName (charsetName);
if (cs == null) if (cs == null)
throw new UnsupportedCharsetException (charsetName); throw new UnsupportedCharsetException (charsetName);
cachedDecoder = null;
cachedEncoder = null;
return cs; return cs;
} }