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.
Co-Authored-By:
Tom Tromey <tromey@redhat.com>
From-SVN: r109294
Showing
- libjava/ChangeLog 25 additions, 0 deletionslibjava/ChangeLog
- libjava/Makefile.in 3 additions, 1 deletionlibjava/Makefile.in
- libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java 90 additions, 0 deletionslibjava/gnu/gcj/convert/BytesToCharsetAdaptor.java
- libjava/gnu/gcj/convert/BytesToUnicode.java 13 additions, 2 deletionslibjava/gnu/gcj/convert/BytesToUnicode.java
- libjava/gnu/gcj/convert/CharsetToBytesAdaptor.java 150 additions, 0 deletionslibjava/gnu/gcj/convert/CharsetToBytesAdaptor.java
- libjava/gnu/gcj/convert/UnicodeToBytes.java 17 additions, 3 deletionslibjava/gnu/gcj/convert/UnicodeToBytes.java
- libjava/gnu/java/nio/charset/Provider.java 0 additions, 154 deletionslibjava/gnu/java/nio/charset/Provider.java
- libjava/java/io/InputStreamReader.java 21 additions, 0 deletionslibjava/java/io/InputStreamReader.java
- libjava/java/io/OutputStreamWriter.java 28 additions, 0 deletionslibjava/java/io/OutputStreamWriter.java
- libjava/java/nio/charset/Charset.java 70 additions, 24 deletionslibjava/java/nio/charset/Charset.java
- libjava/mauve-libgcj 0 additions, 1 deletionlibjava/mauve-libgcj
- libjava/sources.am 3 additions, 1 deletionlibjava/sources.am
Loading
Please register or sign in to comment