------- Comment #4 from tromey at gcc dot gnu dot org 2006-01-04 00:25 ------- Subject: Bug 19132
Author: tromey Date: Wed Jan 4 00:25:28 2006 New Revision: 109304 URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=109304 Log: 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. Added: branches/gcc-4_1-branch/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java - copied unchanged from r109294, trunk/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java branches/gcc-4_1-branch/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.java - copied unchanged from r109294, trunk/libjava/gnu/gcj/convert/CharsetToBytesAdaptor.java Removed: branches/gcc-4_1-branch/libjava/gnu/java/nio/charset/Provider.java Modified: branches/gcc-4_1-branch/libjava/ChangeLog branches/gcc-4_1-branch/libjava/Makefile.in branches/gcc-4_1-branch/libjava/gnu/gcj/convert/BytesToUnicode.java branches/gcc-4_1-branch/libjava/gnu/gcj/convert/UnicodeToBytes.java branches/gcc-4_1-branch/libjava/java/io/InputStreamReader.java branches/gcc-4_1-branch/libjava/java/io/OutputStreamWriter.java branches/gcc-4_1-branch/libjava/java/nio/charset/Charset.java branches/gcc-4_1-branch/libjava/mauve-libgcj branches/gcc-4_1-branch/libjava/sources.am -- http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19132
