diff options
| author | David Daney <ddaney@avtrex.com> | 2006-01-03 22:58:31 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-01-03 22:58:31 +0000 |
| commit | 8ceb88d4cd6ba729b38dee3bda925ab34a75efc9 (patch) | |
| tree | 82dbb00c69057da2d374d746d77eb40854b23164 /libjava/sources.am | |
| parent | 368872c3154af66d44a984737b0119d88431c64f (diff) | |
| download | gcc-8ceb88d4cd6ba729b38dee3bda925ab34a75efc9.tar.gz | |
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
Diffstat (limited to 'libjava/sources.am')
| -rw-r--r-- | libjava/sources.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libjava/sources.am b/libjava/sources.am index 4cd7e49d8fe..d976154598b 100644 --- a/libjava/sources.am +++ b/libjava/sources.am @@ -497,7 +497,9 @@ gnu/gcj.list: $(gnu_gcj_source_files) gnu_gcj_convert_source_files = \ +gnu/gcj/convert/BytesToCharsetAdaptor.java \ gnu/gcj/convert/BytesToUnicode.java \ +gnu/gcj/convert/CharsetToBytesAdaptor.java \ gnu/gcj/convert/Convert.java \ gnu/gcj/convert/IOConverter.java \ gnu/gcj/convert/Input_8859_1.java \ @@ -1350,7 +1352,7 @@ classpath/gnu/java/nio/charset/MacRomania.java \ classpath/gnu/java/nio/charset/MacSymbol.java \ classpath/gnu/java/nio/charset/MacThai.java \ classpath/gnu/java/nio/charset/MacTurkish.java \ -gnu/java/nio/charset/Provider.java \ +classpath/gnu/java/nio/charset/Provider.java \ classpath/gnu/java/nio/charset/US_ASCII.java \ classpath/gnu/java/nio/charset/UTF_16.java \ classpath/gnu/java/nio/charset/UTF_16BE.java \ |