[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: added new io decoders/encoders

Kaffe CVS cvs-commits at kaffe.org
Mon Jan 31 11:11:20 PST 2005


PatchSet 5954 
Date: 2005/01/31 19:06:46
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: added new io decoders/encoders

2005-01-31  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

2005-01-29  Quentin Anciaux  <quentin.anciaux at advalvas.be>

* gnu/classpath/SystemProperties.java (static): Add all aliases
for UTF8, UTF16 and UTF32 (Little and Big Endian), US-ASCII,
iso-8859-[1-9], iso-8859-13, iso-8859-15, cp-1250, cp-1252 and
cp1047 to defaultProperties.
* gnu/java/io/decode/Decoder8859_13.java: New class.
* gnu/java/io/decode/Decoder8859_15.java: Likewise.
* gnu/java/io/decode/Decoder8859_6.java: Likewise.
* gnu/java/io/decode/Decoder8859_7.java: Likewise.
* gnu/java/io/decode/Decoder8859_8.java: Likewise.
* gnu/java/io/decode/Decoder8859_9.java: Likewise.
* gnu/java/io/decode/DecoderASCII.java: Likewise.
* gnu/java/io/decode/DecoderCp1047.java: Likewise.
* gnu/java/io/decode/DecoderEBCDIC_XML_US.java: Likewise.
* gnu/java/io/decode/DecoderUTF16BE.java: Likewise.
* gnu/java/io/decode/DecoderUTF16LE.java: Likewise.
* gnu/java/io/decode/DecoderUTF32BE.java: Likewise.
* gnu/java/io/decode/DecoderUTF32LE.java: Likewise.
* gnu/java/io/decode/DecoderWindows1250.java: Likewise.
* gnu/java/io/decode/DecoderWindows1252.java: Likewise.
* gnu/java/io/encode/Encoder8859_13.java: Likewise.
* gnu/java/io/encode/Encoder8859_15.java: Likewise.
* gnu/java/io/encode/Encoder8859_6.java: Likewise.
* gnu/java/io/encode/Encoder8859_7.java: Likewise.
* gnu/java/io/encode/Encoder8859_8.java: Likewise.
* gnu/java/io/encode/Encoder8859_9.java: Likewise.
* gnu/java/io/encode/EncoderASCII.java: Likewise.
* gnu/java/io/encode/EncoderCp1047.java: Likewise.
* gnu/java/io/encode/EncoderEBCDIC_XML_US.java: Likewise.
* gnu/java/io/encode/EncoderUTF16BE.java: Likewise.
* gnu/java/io/encode/EncoderUTF16LE.java: Likewise.
* gnu/java/io/encode/EncoderUTF32BE.java: Likewise.
* gnu/java/io/encode/EncoderUTF32LE.java: Likewise.
* gnu/java/io/encode/EncoderWindows1250.java: Likewise.
* gnu/java/io/encode/EncoderWindows1252.java: Likewise.

Members: 
	ChangeLog:1.3493->1.3494 
	libraries/javalib/Makefile.am:1.302->1.303 
	libraries/javalib/Makefile.in:1.386->1.387 
	libraries/javalib/all.files:1.84->1.85 
	libraries/javalib/gnu/classpath/SystemProperties.java:1.1->1.2 
	libraries/javalib/gnu/java/io/decode/Decoder8859_13.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/Decoder8859_15.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/Decoder8859_6.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/Decoder8859_7.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/Decoder8859_8.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/Decoder8859_9.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderASCII.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderCp1047.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderEBCDIC_XML_US.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderEightBitLookup.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderUTF16BE.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderUTF16LE.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderUTF32BE.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderUTF32LE.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderWindows1250.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/decode/DecoderWindows1252.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/Encoder8859_13.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/Encoder8859_15.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/Encoder8859_6.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/Encoder8859_7.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/Encoder8859_8.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/Encoder8859_9.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderASCII.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderCp1047.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderEBCDIC_XML_US.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderEightBitLookup.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderUTF16BE.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderUTF16LE.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderUTF32BE.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderUTF32LE.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderWindows1250.java:INITIAL->1.1 
	libraries/javalib/gnu/java/io/encode/EncoderWindows1252.java:INITIAL->1.1 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3493 kaffe/ChangeLog:1.3494
--- kaffe/ChangeLog:1.3493	Sun Jan 30 19:29:59 2005
+++ kaffe/ChangeLog	Mon Jan 31 19:06:46 2005
@@ -1,3 +1,44 @@
+2005-01-31  Dalibor Topic  <robilad at kaffe.org>
+
+        Resynced with GNU Classpath.
+	
+	2005-01-29  Quentin Anciaux  <quentin.anciaux at advalvas.be>
+
+	* gnu/classpath/SystemProperties.java (static): Add all aliases
+	for UTF8, UTF16 and UTF32 (Little and Big Endian), US-ASCII,
+	iso-8859-[1-9], iso-8859-13, iso-8859-15, cp-1250, cp-1252 and
+	cp1047 to defaultProperties.
+	* gnu/java/io/decode/Decoder8859_13.java: New class.
+	* gnu/java/io/decode/Decoder8859_15.java: Likewise.
+	* gnu/java/io/decode/Decoder8859_6.java: Likewise.
+	* gnu/java/io/decode/Decoder8859_7.java: Likewise.
+	* gnu/java/io/decode/Decoder8859_8.java: Likewise.
+	* gnu/java/io/decode/Decoder8859_9.java: Likewise.
+	* gnu/java/io/decode/DecoderASCII.java: Likewise.
+	* gnu/java/io/decode/DecoderCp1047.java: Likewise.
+	* gnu/java/io/decode/DecoderEBCDIC_XML_US.java: Likewise.
+	* gnu/java/io/decode/DecoderUTF16BE.java: Likewise.
+	* gnu/java/io/decode/DecoderUTF16LE.java: Likewise.
+	* gnu/java/io/decode/DecoderUTF32BE.java: Likewise.
+	* gnu/java/io/decode/DecoderUTF32LE.java: Likewise.
+	* gnu/java/io/decode/DecoderWindows1250.java: Likewise.
+	* gnu/java/io/decode/DecoderWindows1252.java: Likewise.
+	* gnu/java/io/encode/Encoder8859_13.java: Likewise.
+	* gnu/java/io/encode/Encoder8859_15.java: Likewise.
+	* gnu/java/io/encode/Encoder8859_6.java: Likewise.
+	* gnu/java/io/encode/Encoder8859_7.java: Likewise.
+	* gnu/java/io/encode/Encoder8859_8.java: Likewise.
+	* gnu/java/io/encode/Encoder8859_9.java: Likewise.
+	* gnu/java/io/encode/EncoderASCII.java: Likewise.
+	* gnu/java/io/encode/EncoderCp1047.java: Likewise.
+	* gnu/java/io/encode/EncoderEBCDIC_XML_US.java: Likewise.
+	* gnu/java/io/encode/EncoderUTF16BE.java: Likewise.
+	* gnu/java/io/encode/EncoderUTF16LE.java: Likewise.
+	* gnu/java/io/encode/EncoderUTF32BE.java: Likewise.
+	* gnu/java/io/encode/EncoderUTF32LE.java: Likewise.
+	* gnu/java/io/encode/EncoderWindows1250.java: Likewise.
+	* gnu/java/io/encode/EncoderWindows1252.java: Likewise.
+
 2005-01-30  Dalibor Topic  <robilad at kaffe.org>
 
 	* configure.ac: Turn jikes error messages into warnings
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.302 kaffe/libraries/javalib/Makefile.am:1.303
--- kaffe/libraries/javalib/Makefile.am:1.302	Thu Jan 27 19:39:11 2005
+++ kaffe/libraries/javalib/Makefile.am	Mon Jan 31 19:06:51 2005
@@ -1055,9 +1055,41 @@
 	gnu/java/io/PlatformHelper.java
 gnu_java_io_decode_SRCS = \
 	gnu/java/io/decode/Decoder.java \
+	gnu/java/io/decode/Decoder8859_13.java \
+	gnu/java/io/decode/Decoder8859_15.java \
+	gnu/java/io/decode/Decoder8859_6.java \
+	gnu/java/io/decode/Decoder8859_7.java \
+	gnu/java/io/decode/Decoder8859_8.java \
+	gnu/java/io/decode/Decoder8859_9.java \
+	gnu/java/io/decode/DecoderASCII.java \
+	gnu/java/io/decode/DecoderCp1047.java \
+	gnu/java/io/decode/DecoderEBCDIC_XML_US.java \
+	gnu/java/io/decode/DecoderEightBitLookup.java \
+	gnu/java/io/decode/DecoderUTF16BE.java \
+	gnu/java/io/decode/DecoderUTF16LE.java \
+	gnu/java/io/decode/DecoderUTF32BE.java \
+	gnu/java/io/decode/DecoderUTF32LE.java \
+	gnu/java/io/decode/DecoderWindows1250.java \
+	gnu/java/io/decode/DecoderWindows1252.java \
 	gnu/java/io/decode/KaffeDecoder.java
 gnu_java_io_encode_SRCS = \
 	gnu/java/io/encode/Encoder.java \
+	gnu/java/io/encode/Encoder8859_13.java \
+	gnu/java/io/encode/Encoder8859_15.java \
+	gnu/java/io/encode/Encoder8859_6.java \
+	gnu/java/io/encode/Encoder8859_7.java \
+	gnu/java/io/encode/Encoder8859_8.java \
+	gnu/java/io/encode/Encoder8859_9.java \
+	gnu/java/io/encode/EncoderASCII.java \
+	gnu/java/io/encode/EncoderCp1047.java \
+	gnu/java/io/encode/EncoderEBCDIC_XML_US.java \
+	gnu/java/io/encode/EncoderEightBitLookup.java \
+	gnu/java/io/encode/EncoderUTF16BE.java \
+	gnu/java/io/encode/EncoderUTF16LE.java \
+	gnu/java/io/encode/EncoderUTF32BE.java \
+	gnu/java/io/encode/EncoderUTF32LE.java \
+	gnu/java/io/encode/EncoderWindows1250.java \
+	gnu/java/io/encode/EncoderWindows1252.java \
 	gnu/java/io/encode/KaffeEncoder.java
 gnu_java_lang_SRCS = \
 	gnu/java/lang/ArrayHelper.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.386 kaffe/libraries/javalib/Makefile.in:1.387
--- kaffe/libraries/javalib/Makefile.in:1.386	Fri Jan 28 15:31:41 2005
+++ kaffe/libraries/javalib/Makefile.in	Mon Jan 31 19:06:52 2005
@@ -1474,10 +1474,42 @@
 
 gnu_java_io_decode_SRCS = \
 	gnu/java/io/decode/Decoder.java \
+	gnu/java/io/decode/Decoder8859_13.java \
+	gnu/java/io/decode/Decoder8859_15.java \
+	gnu/java/io/decode/Decoder8859_6.java \
+	gnu/java/io/decode/Decoder8859_7.java \
+	gnu/java/io/decode/Decoder8859_8.java \
+	gnu/java/io/decode/Decoder8859_9.java \
+	gnu/java/io/decode/DecoderASCII.java \
+	gnu/java/io/decode/DecoderCp1047.java \
+	gnu/java/io/decode/DecoderEBCDIC_XML_US.java \
+	gnu/java/io/decode/DecoderEightBitLookup.java \
+	gnu/java/io/decode/DecoderUTF16BE.java \
+	gnu/java/io/decode/DecoderUTF16LE.java \
+	gnu/java/io/decode/DecoderUTF32BE.java \
+	gnu/java/io/decode/DecoderUTF32LE.java \
+	gnu/java/io/decode/DecoderWindows1250.java \
+	gnu/java/io/decode/DecoderWindows1252.java \
 	gnu/java/io/decode/KaffeDecoder.java
 
 gnu_java_io_encode_SRCS = \
 	gnu/java/io/encode/Encoder.java \
+	gnu/java/io/encode/Encoder8859_13.java \
+	gnu/java/io/encode/Encoder8859_15.java \
+	gnu/java/io/encode/Encoder8859_6.java \
+	gnu/java/io/encode/Encoder8859_7.java \
+	gnu/java/io/encode/Encoder8859_8.java \
+	gnu/java/io/encode/Encoder8859_9.java \
+	gnu/java/io/encode/EncoderASCII.java \
+	gnu/java/io/encode/EncoderCp1047.java \
+	gnu/java/io/encode/EncoderEBCDIC_XML_US.java \
+	gnu/java/io/encode/EncoderEightBitLookup.java \
+	gnu/java/io/encode/EncoderUTF16BE.java \
+	gnu/java/io/encode/EncoderUTF16LE.java \
+	gnu/java/io/encode/EncoderUTF32BE.java \
+	gnu/java/io/encode/EncoderUTF32LE.java \
+	gnu/java/io/encode/EncoderWindows1250.java \
+	gnu/java/io/encode/EncoderWindows1252.java \
 	gnu/java/io/encode/KaffeEncoder.java
 
 gnu_java_lang_SRCS = \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.84 kaffe/libraries/javalib/all.files:1.85
--- kaffe/libraries/javalib/all.files:1.84	Thu Jan 27 19:39:13 2005
+++ kaffe/libraries/javalib/all.files	Mon Jan 31 19:06:54 2005
@@ -656,8 +656,40 @@
 gnu/java/io/ObjectIdentityWrapper.java
 gnu/java/io/PlatformHelper.java
 gnu/java/io/decode/Decoder.java
+gnu/java/io/decode/Decoder8859_13.java
+gnu/java/io/decode/Decoder8859_15.java
+gnu/java/io/decode/Decoder8859_6.java
+gnu/java/io/decode/Decoder8859_7.java
+gnu/java/io/decode/Decoder8859_8.java
+gnu/java/io/decode/Decoder8859_9.java
+gnu/java/io/decode/DecoderASCII.java
+gnu/java/io/decode/DecoderCp1047.java
+gnu/java/io/decode/DecoderEBCDIC_XML_US.java
+gnu/java/io/decode/DecoderEightBitLookup.java
+gnu/java/io/decode/DecoderUTF16BE.java
+gnu/java/io/decode/DecoderUTF16LE.java
+gnu/java/io/decode/DecoderUTF32BE.java
+gnu/java/io/decode/DecoderUTF32LE.java
+gnu/java/io/decode/DecoderWindows1250.java
+gnu/java/io/decode/DecoderWindows1252.java
 gnu/java/io/decode/KaffeDecoder.java
 gnu/java/io/encode/Encoder.java
+gnu/java/io/encode/Encoder8859_13.java
+gnu/java/io/encode/Encoder8859_15.java
+gnu/java/io/encode/Encoder8859_6.java
+gnu/java/io/encode/Encoder8859_7.java
+gnu/java/io/encode/Encoder8859_8.java
+gnu/java/io/encode/Encoder8859_9.java
+gnu/java/io/encode/EncoderASCII.java
+gnu/java/io/encode/EncoderCp1047.java
+gnu/java/io/encode/EncoderEBCDIC_XML_US.java
+gnu/java/io/encode/EncoderEightBitLookup.java
+gnu/java/io/encode/EncoderUTF16BE.java
+gnu/java/io/encode/EncoderUTF16LE.java
+gnu/java/io/encode/EncoderUTF32BE.java
+gnu/java/io/encode/EncoderUTF32LE.java
+gnu/java/io/encode/EncoderWindows1250.java
+gnu/java/io/encode/EncoderWindows1252.java
 gnu/java/io/encode/KaffeEncoder.java
 gnu/java/lang/ArrayHelper.java
 gnu/java/lang/CharData.java
Index: kaffe/libraries/javalib/gnu/classpath/SystemProperties.java
diff -u kaffe/libraries/javalib/gnu/classpath/SystemProperties.java:1.1 kaffe/libraries/javalib/gnu/classpath/SystemProperties.java:1.2
--- kaffe/libraries/javalib/gnu/classpath/SystemProperties.java:1.1	Wed Dec  8 07:22:31 2004
+++ kaffe/libraries/javalib/gnu/classpath/SystemProperties.java	Mon Jan 31 19:06:55 2005
@@ -1,5 +1,5 @@
 /* SystemProperties.java -- Manage the System properties.
-   Copyright (C) 2004 Free Software Foundation
+   Copyright (C) 2004, 2005 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -102,117 +102,395 @@
         }
 
         // Common encoding aliases. See gnu.java.io.EncodingManager.
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO8859_1",
-            "8859_1");
-
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-1",
-            "8859_1");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-2",
-            "8859_2");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-3",
-            "8859_3");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-4",
-            "8859_4");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-5",
-            "8859_5");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-6",
-            "8859_6");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-7",
-            "8859_7");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-8",
-            "8859_8");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-9",
-            "8859_9");
-
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-1",
-            "8859_1");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-2",
-            "8859_2");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-3",
-            "8859_3");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-4",
-            "8859_4");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-5",
-            "8859_5");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-6",
-            "8859_6");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-7",
-            "8859_7");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-8",
-            "8859_8");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-9",
-            "8859_9");
-
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_1",
-            "8859_1");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_2",
-            "8859_2");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_3",
-            "8859_3");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_4",
-            "8859_4");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_5",
-            "8859_5");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_6",
-            "8859_6");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_7",
-            "8859_7");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_8",
-            "8859_8");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_9",
-            "8859_9");
-
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-1",
-            "8859_1");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-2",
-            "8859_2");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-3",
-            "8859_3");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-4",
-            "8859_4");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-5",
-            "8859_5");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-6",
-            "8859_6");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-7",
-            "8859_7");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-8",
-            "8859_8");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-9",
-            "8859_9");
-
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin1",
-            "8859_1");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin2",
-            "8859_2");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin3",
-            "8859_3");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin4",
-            "8859_4");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin5",
-            "8859_5");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin6",
-            "8859_6");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin7",
-            "8859_7");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin8",
-            "8859_8");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin9",
-            "8859_9");
-
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.UTF-8", "UTF8");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.utf-8", "UTF8");
-
-        // XXX FIXME - Cheat a little for ASCII.
-        // Remove when we get a real "ASCII En/Decoder"
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ASCII", "8859_1");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.ascii", "8859_1");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.US-ASCII",
-            "8859_1");
-        defaultProperties.put("gnu.java.io.encoding_scheme_alias.us-ascii",
-            "8859_1");
-
-        // 8859_1 is a safe default encoding to use when not explicitly set
+	Properties dp = defaultProperties;
+	
+	//# UTF8
+	dp.put("gnu.java.io.encoding_scheme_alias.utf8", "UTF8");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF8", "UTF8");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf-8", "UTF8");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF-8", "UTF8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1208", "UTF8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1209", "UTF8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-5304", "UTF8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-5305", "UTF8");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-65001", "UTF8");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp1208", "UTF8");
+
+	//# UTF16 Little Endian
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF16LE", "UTF16LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf16le", "UTF16LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf-16le", "UTF16LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF-16LE", "UTF16LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.x-utf-16le", "UTF16LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1202", "UTF16LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-13490", "UTF16LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-17586", "UTF16LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF16_LittleEndian",
+	       "UTF16LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-1200", "UTF16LE");
+
+	//# UTF16 Big Endian
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF16BE", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf16be", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf-16be", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF-16BE", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.x-utf-16be", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1200", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1201", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-5297", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-13488", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-17584", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-1201", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp1200", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp1201", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF16_BigEndian", "UTF16BE");
+
+	//# UTF16
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF16", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf16", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf-16", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF-16", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-10646-UCS-2", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-10646-ucs-2", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.unicode", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.csUnicode", "UTF16BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ucs-2", "UTF16BE");
+	//# UTF32 Little Endian
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF32LE", "UTF32LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf32le", "UTF32LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf-32le", "UTF32LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF-32LE", "UTF32LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF32_LittleEndian",
+	       "UTF32LE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1234", "UTF32LE");
+
+	//# UTF32 Big Endian
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF32BE", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf-32be", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf32be", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF-32BE", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF32_BigEndian",
+	       "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1232", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1233", "UTF32BE");
+
+	//# UTF32
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF32", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf-32", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.utf32", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.UTF-32", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-10646-UCS-4",
+	       "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.csUCS4", "UTF32BE");
+	dp.put("gnu.java.io.encoding_scheme_alias.ucs-4", "UTF32BE");
+
+	//# US-ASCII
+	dp.put("gnu.java.io.encoding_scheme_alias.ASCII", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.US-ASCII", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.ascii", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.ANSI_X3.4-1968", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.ANSI_X3.4-1986", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_646.irv:1991", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_646.irv:1983", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO646-US", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.us", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.csASCII", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-6", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp367", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.ascii7", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.646", "ASCII");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-20127", "ASCII");
+
+	//# iso-8859-1 (latin 1)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-819", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.IBM819", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp819", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.Latin1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.latin1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-100", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-1:1987", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.l1", "8859_1");
+	dp.put("gnu.java.io.encoding_scheme_alias.819", "8859_1");
+
+	//# iso-8859-2 (latin 2)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-912_P100-1995",
+	       "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-912", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-2:1987", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.Latin2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.latin2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-101", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.l2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_2", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp912", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.912", "8859_2");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-28592", "8859_2");
+
+	//# iso-8859-3 (latin 3)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-913_P100-2000",
+	       "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-913", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-3:1988", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.Latin3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.latin3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-109", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.l3", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp913", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.913", "8859_3");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-28593", "8859_3");
+
+	//# iso-8859-4 (latin 4)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-914_P100-1995",
+	       "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-914", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.Latin4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.latin4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-110", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-4:1988", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.l4", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp914", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.914", "8859_4");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-28594", "8859_4");
+
+	//# iso-8859-5 (cyrillic)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_5", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-915_P100-1995",
+	       "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-915", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_5", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_5", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_5", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_5", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-5", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-5", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.cyrillic", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.csISOLatinCyrillic",
+	       "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-144", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-5:1988", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp915", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.915", "8859_5");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-28595", "8859_5");
+
+	//# iso-8859-6 (arabic)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_6", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1089_P100-1995",
+	       "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1089", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_6", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_6", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_6", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_6", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-6", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-6", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.arabic", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.csISOLatinArabic", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-127", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-6:1987", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ECMA-114", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ASMO-708", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_6", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp1089", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.1089", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-28596", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-6-I", "8859_6");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-6-E", "8859_6");
+
+	//# iso-8859-7 (greek)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_7", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-813_P100-1995",
+	       "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-813", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_7", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_7", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_7", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_7", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-7", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-7", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.greek", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.greek8", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.ELOT_928", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.ECMA-118", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.csISOLatinGreek", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-126", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-7:1987", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp813", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.813", "8859_7");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-28597", "8859_7");
+
+	//# iso-8859-8 (hebrew)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_8", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-916_P100-1995",
+	       "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-916", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_8", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_8", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_8", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_8", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-8", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-8", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.hebrew", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.csISOLatinHebrew", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-138", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-8:1988", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-8-I", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-8-E", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp916", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.916", "8859_8");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-28598", "8859_8");
+
+	//# iso-8859-9 (latin-5)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_9", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-920_P100-1995",
+	       "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-920", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_9", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_9", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-9", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-9", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_9", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_9", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.latin5", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.Latin5", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin5", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-148", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-9:1989", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.l5", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp920", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.920", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-28599", "8859_9");
+	dp.put("gnu.java.io.encoding_scheme_alias.ECMA-128", "8859_9");
+
+	//# iso-8859-13 
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_13", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-921_P100-1995",
+	       "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-921", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_13", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_13", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_13", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_13", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-13", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-13", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_13", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp921", "8859_13");
+	dp.put("gnu.java.io.encoding_scheme_alias.921", "8859_13");
+
+	//# iso-8859-15 (latin-9)
+	dp.put("gnu.java.io.encoding_scheme_alias.8859_15", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_15", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_15", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-15", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-15", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.8859-15", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.latin9", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.Latin9", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_15", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_15", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-923_P100-1998",
+	       "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-923", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.Latin-9", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.l9", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.latin0", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.csisolatin0", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.csisolatin9", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.iso8859_15_fdis", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp923", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.923", "8859_15");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-28605", "8859_15");
+
+	//# Windows-1252 (cp-1252)
+	dp.put("gnu.java.io.encoding_scheme_alias.Windows1252", "Windows1252");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-5348_P100-1997",
+	       "Windows1252");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-5348", "Windows1252");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-1252",
+	       "Windows1252");
+	dp.put("gnu.java.io.encoding_scheme_alias.Windows-1252",
+	       "Windows1252");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp1252", "Windows1252");
+	dp.put("gnu.java.io.encoding_scheme_alias.CP1252", "Windows1252");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp-1252", "Windows1252");
+	dp.put("gnu.java.io.encoding_scheme_alias.CP-1252", "Windows1252");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows1252", "Windows1252");
+
+	//# Windows-1250 (cp-1250)
+	dp.put("gnu.java.io.encoding_scheme_alias.Windows1250", "Windows1250");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-5346_P100-1998",
+	       "Windows1250");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-5346", "Windows1250");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows-1250",
+	       "Windows1250");
+	dp.put("gnu.java.io.encoding_scheme_alias.Windows-1250",
+	       "Windows1250");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp1250", "Windows1250");
+	dp.put("gnu.java.io.encoding_scheme_alias.CP1250", "Windows1250");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp-1250", "Windows1250");
+	dp.put("gnu.java.io.encoding_scheme_alias.CP-1250", "Windows1250");
+	dp.put("gnu.java.io.encoding_scheme_alias.windows1250", "Windows1250");
+
+	//# ebcdic-xml-us
+	dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC_XML_US",
+	       "EBCDIC_XML_US");
+	dp.put("gnu.java.io.encoding_scheme_alias.ebcdic-xml-us",
+	       "EBCDIC_XML_US");
+	dp.put("gnu.java.io.encoding_scheme_alias.ebcdic", "EBCDIC_XML_US");
+	dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC", "EBCDIC_XML_US");
+	dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC-XML-US",
+	       "EBCDIC_XML_US");
+	dp.put("gnu.java.io.encoding_scheme_alias.ebcdic_xml_us",
+	       "EBCDIC_XML_US");
+
+	//# ebcdic latin 1 (cp1047)
+	dp.put("gnu.java.io.encoding_scheme_alias.Cp1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1047_P100-1995",
+	       "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.ibm-1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.IBM1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.cpibm1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.CP1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.cp-1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.CP-1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.ebcdic1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.ebcdic-1047", "Cp1047");
+	dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC-1047", "Cp1047");
+	
+	// 8859_1 is a safe default encoding to use when not explicitly set
         if (defaultProperties.get("file.encoding") == null)
             defaultProperties.put("file.encoding", "8859_1");
 
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/io/decode/Decoder8859_13.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/io/decode/Decoder8859_13.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/io/decode/Decoder8859_13.java	Mon Jan 31 19:11:18 2005
@@ -0,0 +1,100 @@
+/* Decoder8859_13.java -- Decoder for ISO-8859-13 Character set.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.io.decode;
+
+import java.io.InputStream;
+
+/**
+ * This class decodes bytes in ISO-8859-13 format to Unicode. 8859_13
+ * ibm-921_P100-1995 ibm-921 ISO_8859_13 iso_8859_13 ISO8859_13 iso8859_13
+ * ISO-8859-13 iso-8859-13 8859_13 cp921 921
+ * 
+ * @version 0.0
+ * @author Quentin Anciaux (quentin.anciaux at advalvas.be)
+ * @author based on gnu.java.io.decode.Decoder8859_1 by Aaron M. Renn
+ *         (arenn at urbanophile.com)
+ */
+public class Decoder8859_13 extends DecoderEightBitLookup
+{
+
+  /**
+   * This is the lookup table for this encoding
+   */
+  private static final char[]	lookup_table_8859_13	=
+    { 0x0000, 0x0001,
+      0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009,
+      0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011,
+      0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019,
+      0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 0x0020, 0x0021,
+      0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029,
+      0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031,
+      0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039,
+      0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041,
+      0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049,
+      0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, 0x0051,
+      0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059,
+      0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061,
+      0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069,
+      0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, 0x0071,
+      0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079,
+      0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x0080, 0x0081,
+      0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089,
+      0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 0x0090, 0x0091,
+      0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099,
+      0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 0x00A0, 0x201D,
+      0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7, 0x00D8, 0x00A9,
+      0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6, 0x00B0, 0x00B1,
+      0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7, 0x00F8, 0x00B9,
+      0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6, 0x0104, 0x012E,
+      0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, 0x010C, 0x00C9,
+      0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, 0x0160, 0x0143,
+      0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, 0x0172, 0x0141,
+      0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, 0x0105, 0x012F,
+      0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9,
+      0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, 0x0161, 0x0144,
+      0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142,
+      0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019 };
+
+  public Decoder8859_13(InputStream in)
+  {
+    super(in, "8859_13", lookup_table_8859_13);
+  }
+
+} // class Decoder8859_13
+
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/io/decode/Decoder8859_15.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/io/decode/Decoder8859_15.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/io/decode/Decoder8859_15.java	Mon Jan 31 19:11:18 2005
@@ -0,0 +1,101 @@
+/* Decoder8859_15.java -- Decoder for ISO-Latin-9 Character set.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.io.decode;
+
+import java.io.InputStream;
+
+/**
+ * This class decodes bytes in ISO-8859-15 (Latin-9) format to Unicode.
+ * ISO-8859-15 iso-8859-15 8859-15 8859_15 latin9 Latin9 ISO_8859_15
+ * iso_8859_15 ibm-923_P100-1998 ibm-923 Latin-9 l9 8859_15 latin0
+ * csisolatin0 csisolatin9 iso8859_15_fdis cp923 923 windows-28605
+ * 
+ * @version 0.0
+ * @author Quentin Anciaux (quentin.anciaux at advalvas.be)
+ * @author based on gnu.java.io.decode.Decoder8859_1 by Aaron M. Renn
+ *         (arenn at urbanophile.com)
+ */
+public class Decoder8859_15 extends DecoderEightBitLookup
+{
+
+  /**
+   * This is the lookup table for this encoding
+   */
+  private static final char[]	lookup_table_8859_15	=
+    { 0x0000, 0x0001,
+      0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009,
+      0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011,
+      0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019,
+      0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 0x0020, 0x0021,
+      0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029,
+      0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031,
+      0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039,
+      0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041,
+      0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049,
+      0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, 0x0051,
+      0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059,
+      0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061,
+      0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069,
+      0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, 0x0071,
+      0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079,
+      0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x0080, 0x0081,
+      0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089,
+      0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, 0x0090, 0x0091,
+      0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099,
+      0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, 0x00A0, 0x00A1,
+      0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7, 0x0161, 0x00A9,
+      0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1,
+      0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7, 0x017E, 0x00B9,
+      0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF, 0x00C0, 0x00C1,
+      0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9,
+      0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x00D1,
+      0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9,
+      0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1,
+      0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9,
+      0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0, 0x00F1,

*** Patch too long, truncated ***



More information about the kaffe mailing list