OSDN Git Service

PR libgcj/9715, PR libgcj/19132:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 3 Jan 2006 22:58:31 +0000 (22:58 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 3 Jan 2006 22:58:31 +0000 (22:58 +0000)
commit8a0383655d7d869ef9d344202c78ce3659927052
tree82dbb00c69057da2d374d746d77eb40854b23164
parentbd63b9439095ee94c8dd44ea2225d9db2a2db2c2
PR libgcj/9715, PR libgcj/19132:
* java/nio/charset/Charset.java (charsetForName): Try default
provider first.
(availableCharsets): Re-merged.
(providers2): Likewise.
(defaultCharset): Likewise.
* sources.am, Makefile.in: Rebuilt.
* gnu/java/nio/charset/Provider.java: Removed.
* java/io/OutputStreamWriter.java
(OutputStreamWriter(OutputStream,Charset)): New constructor.
(OutputStreamWriter(OutputStream,CharsetEncoder)): Likewise.
* java/io/InputStreamReader.java
(InputStreamReader(InputStream,CharsetDecoder)): New constructor.
(InputStreamReader(InputStream,Charset)): Likewise.
* gnu/gcj/convert/BytesToUnicode.java (getDecoder): Try a
BytesToCharsetAdaptor.
* gnu/gcj/convert/UnicodeToBytes.java (getEncoder): Try a
CharsetToBytesAdaptor.
* gnu/gcj/convert/CharsetToBytesAdaptor.java: New file.
* gnu/gcj/convert/BytesToCharsetAdaptor.java: New file.
* mauve-libgcj: Remove getEncoding exclusion.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109294 138bc75d-0d04-0410-961f-82ee72b054a4
12 files changed:
libjava/ChangeLog
libjava/Makefile.in
libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java [new file with mode: 0644]
libjava/gnu/gcj/convert/BytesToUnicode.java
libjava/gnu/gcj/convert/CharsetToBytesAdaptor.java [new file with mode: 0644]
libjava/gnu/gcj/convert/UnicodeToBytes.java
libjava/gnu/java/nio/charset/Provider.java [deleted file]
libjava/java/io/InputStreamReader.java
libjava/java/io/OutputStreamWriter.java
libjava/java/nio/charset/Charset.java
libjava/mauve-libgcj
libjava/sources.am