yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR libgcj/9715, PR libgcj/19132:

Browse Source 
* 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
This commit is contained in:
David Daney
2006-01-03 22:58:31 +00:00
committed by Tom Tromey
parent 368872c315
commit 8ceb88d4cd
12 changed files with 420 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/gnu/gcj/convert/UnicodeToBytes.java
+17 -3
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation
/* Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation
This file is part of libgcj.
@@ -8,6 +8,8 @@ details. */
package gnu.gcj.convert;
import java.nio.charset.Charset;
public abstract class UnicodeToBytes extends IOConverter
{
/** Buffer to emit bytes to.
@@ -99,10 +101,22 @@ public abstract class UnicodeToBytes extends IOConverter
catch (Throwable ex)
{
try
{
{
// We pass the original name to iconv and let it handle
// its own aliasing.
// its own aliasing. Note that we intentionally prefer
// iconv over nio.
return new Output_iconv (encoding);
}
catch (Throwable _)
{
// Ignore, and try the next method.
}
try
{
// Try using finding java.nio.charset.Charset and using
// the adaptor. Use the original name as Charsets have
// their own canonical names.
return new CharsetToBytesAdaptor(Charset.forName(encoding));
}
catch (Throwable _)
{