encodings.pl: New file.

* scripts/encodings.pl: New file.
	* Makefile.in: Rebuilt.
	* Makefile.am (convert_source_files): Added IOConverter.java.
	* gnu/gcj/convert/UnicodeToBytes.java (UnicodeToBytes): Extend
	IOConverter.
	(getDefaultDecodingClass): Canonicalize default encoding name.
	(getEncoder): Likewise.
	* gnu/gcj/convert/BytesToUnicode.java (BytesToUnicode): Extend
	IOConverter.
	(getDefaultDecodingClass): Canonicalize default encoding name.
	(getDecoder): Likewise.
	* gnu/gcj/convert/IOConverter.java: New file.

From-SVN: r35432
This commit is contained in:
Tom Tromey 2000-08-02 19:56:53 +00:00 committed by Tom Tromey
parent 5f51a7528f
commit f9427d1704
7 changed files with 186 additions and 30 deletions

View file

@ -8,7 +8,7 @@ details. */
package gnu.gcj.convert;
public abstract class BytesToUnicode
public abstract class BytesToUnicode extends IOConverter
{
/** Buffer to read bytes from.
* The characters inbuffer[inpos] ... inbuffer[inlength-1] are available. */
@ -25,7 +25,7 @@ public abstract class BytesToUnicode
// Test (defaultDecodingClass == null) again in case of race condition.
if (defaultDecodingClass == null)
{
String encoding = System.getProperty("file.encoding");
String encoding = canonicalize (System.getProperty("file.encoding"));
String className = "gnu.gcj.convert.Input_"+encoding;
try
{
@ -60,7 +60,7 @@ public abstract class BytesToUnicode
public static BytesToUnicode getDecoder (String encoding)
throws java.io.UnsupportedEncodingException
{
String className = "gnu.gcj.convert.Input_"+encoding;
String className = "gnu.gcj.convert.Input_" + canonicalize (encoding);
Class decodingClass;
try
{
@ -71,6 +71,8 @@ public abstract class BytesToUnicode
{
try
{
// We pass the original name to iconv and let it handle
// its own aliasing.
return new Input_iconv (encoding);
}
catch (Throwable _)