Merge
diff --git a/make/java/sun_nio/FILES_java.gmk b/make/java/sun_nio/FILES_java.gmk
index be1452d..b00fb04 100644
--- a/make/java/sun_nio/FILES_java.gmk
+++ b/make/java/sun_nio/FILES_java.gmk
@@ -76,63 +76,3 @@
     sun/nio/cs/UTF_32BE_BOM.java \
     sun/nio/cs/UTF_32LE_BOM.java
 
-
-FILES_java += \
-    sun/io/Converters.java \
-    sun/io/ByteToCharConverter.java \
-    sun/io/ByteToCharASCII.java \
-    sun/io/ByteToCharUTF8.java \
-    sun/io/ByteToCharUTF16.java \
-    sun/io/ByteToCharUnicode.java \
-    sun/io/ByteToCharUnicodeBig.java  \
-    sun/io/ByteToCharUnicodeBigUnmarked.java \
-    sun/io/ByteToCharUnicodeLittle.java \
-    sun/io/ByteToCharUnicodeLittleUnmarked.java \
-    sun/io/CharToByteConverter.java \
-    sun/io/CharToByteASCII.java \
-    sun/io/CharToByteUTF8.java \
-    sun/io/CharToByteUTF16.java \
-    sun/io/CharToByteUnicode.java \
-    sun/io/CharToByteUnicodeBig.java \
-    sun/io/CharToByteUnicodeBigUnmarked.java \
-    sun/io/CharToByteUnicodeLittle.java \
-    sun/io/CharToByteUnicodeLittleUnmarked.java \
-    sun/io/CharacterEncoding.java \
-    sun/io/ConversionBufferFullException.java \
-    sun/io/MalformedInputException.java \
-    sun/io/UnknownCharacterException.java \
-    sun/io/ByteToCharISO8859_1.java \
-    sun/io/CharToByteISO8859_1.java \
-    sun/io/ByteToCharISO8859_2.java \
-    sun/io/CharToByteISO8859_2.java \
-    sun/io/ByteToCharISO8859_4.java \
-    sun/io/CharToByteISO8859_4.java \
-    sun/io/ByteToCharISO8859_5.java \
-    sun/io/CharToByteISO8859_5.java \
-    sun/io/ByteToCharISO8859_7.java \
-    sun/io/CharToByteISO8859_7.java \
-    sun/io/ByteToCharISO8859_9.java \
-    sun/io/CharToByteISO8859_9.java \
-    sun/io/ByteToCharISO8859_13.java \
-    sun/io/CharToByteISO8859_13.java \
-    sun/io/ByteToCharISO8859_15.java \
-    sun/io/CharToByteISO8859_15.java \
-    sun/io/ByteToCharCp1250.java \
-    sun/io/CharToByteCp1250.java \
-    sun/io/ByteToCharCp1251.java \
-    sun/io/CharToByteCp1251.java \
-    sun/io/ByteToCharCp1252.java \
-    sun/io/CharToByteCp1252.java \
-    sun/io/ByteToCharCp1253.java \
-    sun/io/CharToByteCp1253.java \
-    sun/io/ByteToCharCp1254.java \
-    sun/io/CharToByteCp1254.java \
-    sun/io/ByteToCharCp1257.java \
-    sun/io/CharToByteCp1257.java \
-    sun/io/ByteToCharKOI8_R.java \
-    sun/io/CharToByteKOI8_R.java \
-    sun/io/ByteToCharSingleByte.java \
-    sun/io/CharToByteSingleByte.java
-
-
-
diff --git a/make/java/sun_nio/Makefile b/make/java/sun_nio/Makefile
index ebe1546..c3c11ac 100644
--- a/make/java/sun_nio/Makefile
+++ b/make/java/sun_nio/Makefile
@@ -31,8 +31,7 @@
 PACKAGE = sun.nio
 PRODUCT = sun
 
-JAVAC_MAX_WARNINGS = false
-JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
+JAVAC_MAX_WARNINGS = true
 JAVAC_WARNINGS_FATAL = true
 include $(BUILDDIR)/common/Defs.gmk
 
diff --git a/make/sun/nio/cs/FILES_java.gmk b/make/sun/nio/cs/FILES_java.gmk
index c71ecf7..05d722b 100644
--- a/make/sun/nio/cs/FILES_java.gmk
+++ b/make/sun/nio/cs/FILES_java.gmk
@@ -29,277 +29,6 @@
 # Core character converters are built from make/java/java.
 #
 
-FILES_src = \
-	sun/io/ByteToCharDoubleByte.java \
-	sun/io/ByteToCharDBCS_ASCII.java \
-	sun/io/ByteToCharDBCS_EBCDIC.java \
-	sun/io/ByteToCharEUC.java \
-	sun/io/CharToByteDoubleByte.java \
-	sun/io/CharToByteDBCS_ASCII.java \
-	sun/io/CharToByteDBCS_EBCDIC.java \
-	sun/io/CharToByteEUC.java \
-	sun/io/ByteToCharBig5.java \
-	sun/io/ByteToCharBig5_Solaris.java \
-	sun/io/ByteToCharBig5_HKSCS.java \
-	sun/io/ByteToCharMS950_HKSCS.java \
-	sun/io/ByteToCharGB18030.java \
-	sun/io/ByteToCharGB18030DB.java \
-	sun/io/ByteToCharCp037.java \
-	sun/io/ByteToCharCp1006.java \
-	sun/io/ByteToCharCp1025.java \
-	sun/io/ByteToCharCp1026.java \
-	sun/io/ByteToCharCp1046.java \
-	sun/io/ByteToCharCp1047.java \
-	sun/io/ByteToCharCp1097.java \
-	sun/io/ByteToCharCp1098.java \
-	sun/io/ByteToCharCp1112.java \
-	sun/io/ByteToCharCp1122.java \
-	sun/io/ByteToCharCp1123.java \
-	sun/io/ByteToCharCp1124.java \
-	sun/io/ByteToCharCp1140.java \
-	sun/io/ByteToCharCp1141.java \
-	sun/io/ByteToCharCp1142.java \
-	sun/io/ByteToCharCp1143.java \
-	sun/io/ByteToCharCp1144.java \
-	sun/io/ByteToCharCp1145.java \
-	sun/io/ByteToCharCp1146.java \
-	sun/io/ByteToCharCp1147.java \
-	sun/io/ByteToCharCp1148.java \
-	sun/io/ByteToCharCp1149.java \
-	sun/io/ByteToCharCp1255.java \
-	sun/io/ByteToCharCp1256.java \
-	sun/io/ByteToCharCp1258.java \
-	sun/io/ByteToCharCp1381.java \
-	sun/io/ByteToCharCp1383.java \
-	sun/io/ByteToCharCp273.java \
-	sun/io/ByteToCharCp277.java \
-	sun/io/ByteToCharCp278.java \
-	sun/io/ByteToCharCp280.java \
-	sun/io/ByteToCharCp284.java \
-	sun/io/ByteToCharCp285.java \
-	sun/io/ByteToCharCp297.java \
-	sun/io/ByteToCharCp33722.java \
-	sun/io/ByteToCharCp420.java \
-	sun/io/ByteToCharCp424.java \
-	sun/io/ByteToCharCp437.java \
-	sun/io/ByteToCharCp500.java \
-	sun/io/ByteToCharCp737.java \
-	sun/io/ByteToCharCp775.java \
-	sun/io/ByteToCharCp833.java \
-	sun/io/ByteToCharCp834.java \
-	sun/io/ByteToCharCp838.java \
-	sun/io/ByteToCharCp850.java \
-	sun/io/ByteToCharCp852.java \
-	sun/io/ByteToCharCp855.java \
-	sun/io/ByteToCharCp856.java \
-	sun/io/ByteToCharCp857.java \
-	sun/io/ByteToCharCp858.java \
-	sun/io/ByteToCharCp860.java \
-	sun/io/ByteToCharCp861.java \
-	sun/io/ByteToCharCp862.java \
-	sun/io/ByteToCharCp863.java \
-	sun/io/ByteToCharCp864.java \
-	sun/io/ByteToCharCp865.java \
-	sun/io/ByteToCharCp866.java \
-	sun/io/ByteToCharCp868.java \
-	sun/io/ByteToCharCp869.java \
-	sun/io/ByteToCharCp870.java \
-	sun/io/ByteToCharCp871.java \
-	sun/io/ByteToCharCp874.java \
-	sun/io/ByteToCharCp875.java \
-	sun/io/ByteToCharCp918.java \
-	sun/io/ByteToCharCp921.java \
-	sun/io/ByteToCharCp922.java \
-	sun/io/ByteToCharCp930.java \
-	sun/io/ByteToCharCp933.java \
-	sun/io/ByteToCharCp935.java \
-	sun/io/ByteToCharCp937.java \
-	sun/io/ByteToCharCp939.java \
-	sun/io/ByteToCharCp942.java \
-	sun/io/ByteToCharCp942C.java \
-	sun/io/ByteToCharCp943.java \
-	sun/io/ByteToCharCp943C.java \
-	sun/io/ByteToCharCp948.java \
-	sun/io/ByteToCharCp949.java \
-	sun/io/ByteToCharCp949C.java \
-	sun/io/ByteToCharCp950.java \
-	sun/io/ByteToCharCp964.java \
-	sun/io/ByteToCharCp970.java \
-	sun/io/ByteToCharJIS0201.java \
-	sun/io/ByteToCharJIS0208.java \
-	sun/io/ByteToCharJIS0208_Solaris.java \
-	sun/io/ByteToCharJIS0212.java \
-	sun/io/ByteToCharJIS0212_Solaris.java \
-	sun/io/ByteToCharEUC_CN.java \
-	sun/io/ByteToCharEUC_JP.java \
-	sun/io/ByteToCharEUC_JP_LINUX.java \
-	sun/io/ByteToCharEUC_JP_Solaris.java \
-	sun/io/ByteToCharEUC_KR.java \
-	sun/io/ByteToCharEUC_TW.java \
-	sun/io/ByteToCharSJIS.java \
-	sun/io/ByteToCharPCK.java \
-	sun/io/ByteToCharGBK.java \
-	sun/io/ByteToCharISCII91.java \
-	sun/io/ByteToCharISO2022.java \
-	sun/io/ByteToCharISO2022CN.java \
-	sun/io/ByteToCharISO2022JP.java \
-	sun/io/ByteToCharISO2022KR.java \
-	sun/io/ByteToCharISO8859_3.java \
-	sun/io/ByteToCharISO8859_6.java \
-	sun/io/ByteToCharISO8859_8.java \
-	sun/io/ByteToCharJISAutoDetect.java \
-	sun/io/ByteToCharJohab.java \
-	sun/io/ByteToCharMS874.java \
-	sun/io/ByteToCharMS932.java \
-	sun/io/ByteToCharMS936.java \
-	sun/io/ByteToCharMS949.java \
-	sun/io/ByteToCharMS950.java \
-	sun/io/ByteToCharMacArabic.java \
-	sun/io/ByteToCharMacCentralEurope.java \
-	sun/io/ByteToCharMacCroatian.java \
-	sun/io/ByteToCharMacCyrillic.java \
-	sun/io/ByteToCharMacDingbat.java \
-	sun/io/ByteToCharMacGreek.java \
-	sun/io/ByteToCharMacHebrew.java \
-	sun/io/ByteToCharMacIceland.java \
-	sun/io/ByteToCharMacRoman.java \
-	sun/io/ByteToCharMacRomania.java \
-	sun/io/ByteToCharMacSymbol.java \
-	sun/io/ByteToCharMacThai.java \
-	sun/io/ByteToCharMacTurkish.java \
-	sun/io/ByteToCharMacUkraine.java \
-	sun/io/ByteToCharTIS620.java \
-	sun/io/CharToByteBig5.java \
-	sun/io/CharToByteBig5_Solaris.java \
-	sun/io/CharToByteBig5_HKSCS.java \
-	sun/io/CharToByteMS950_HKSCS.java \
-	sun/io/CharToByteGB18030.java \
-	sun/io/CharToByteCp037.java \
-	sun/io/CharToByteCp1006.java \
-	sun/io/CharToByteCp1025.java \
-	sun/io/CharToByteCp1026.java \
-	sun/io/CharToByteCp1046.java \
-	sun/io/CharToByteCp1047.java \
-	sun/io/CharToByteCp1097.java \
-	sun/io/CharToByteCp1098.java \
-	sun/io/CharToByteCp1112.java \
-	sun/io/CharToByteCp1122.java \
-	sun/io/CharToByteCp1123.java \
-	sun/io/CharToByteCp1124.java \
-	sun/io/CharToByteCp1140.java \
-	sun/io/CharToByteCp1141.java \
-	sun/io/CharToByteCp1142.java \
-	sun/io/CharToByteCp1143.java \
-	sun/io/CharToByteCp1144.java \
-	sun/io/CharToByteCp1145.java \
-	sun/io/CharToByteCp1146.java \
-	sun/io/CharToByteCp1147.java \
-	sun/io/CharToByteCp1148.java \
-	sun/io/CharToByteCp1149.java \
-	sun/io/CharToByteCp1255.java \
-	sun/io/CharToByteCp1256.java \
-	sun/io/CharToByteCp1258.java \
-	sun/io/CharToByteCp1381.java \
-	sun/io/CharToByteCp1383.java \
-	sun/io/CharToByteCp273.java \
-	sun/io/CharToByteCp277.java \
-	sun/io/CharToByteCp278.java \
-	sun/io/CharToByteCp280.java \
-	sun/io/CharToByteCp284.java \
-	sun/io/CharToByteCp285.java \
-	sun/io/CharToByteCp297.java \
-	sun/io/CharToByteCp33722.java \
-	sun/io/CharToByteCp420.java \
-	sun/io/CharToByteCp424.java \
-	sun/io/CharToByteCp437.java \
-	sun/io/CharToByteCp500.java \
-	sun/io/CharToByteCp737.java \
-	sun/io/CharToByteCp775.java \
-	sun/io/CharToByteCp833.java \
-	sun/io/CharToByteCp834.java \
-	sun/io/CharToByteCp838.java \
-	sun/io/CharToByteCp850.java \
-	sun/io/CharToByteCp852.java \
-	sun/io/CharToByteCp855.java \
-	sun/io/CharToByteCp856.java \
-	sun/io/CharToByteCp857.java \
-	sun/io/CharToByteCp858.java \
-	sun/io/CharToByteCp860.java \
-	sun/io/CharToByteCp861.java \
-	sun/io/CharToByteCp862.java \
-	sun/io/CharToByteCp863.java \
-	sun/io/CharToByteCp864.java \
-	sun/io/CharToByteCp865.java \
-	sun/io/CharToByteCp866.java \
-	sun/io/CharToByteCp868.java \
-	sun/io/CharToByteCp869.java \
-	sun/io/CharToByteCp870.java \
-	sun/io/CharToByteCp871.java \
-	sun/io/CharToByteCp874.java \
-	sun/io/CharToByteCp875.java \
-	sun/io/CharToByteCp918.java \
-	sun/io/CharToByteCp921.java \
-	sun/io/CharToByteCp922.java \
-	sun/io/CharToByteCp930.java \
-	sun/io/CharToByteCp933.java \
-	sun/io/CharToByteCp935.java \
-	sun/io/CharToByteCp937.java \
-	sun/io/CharToByteCp939.java \
-	sun/io/CharToByteCp942.java \
-	sun/io/CharToByteCp942C.java \
-	sun/io/CharToByteCp943.java \
-	sun/io/CharToByteCp943C.java \
-	sun/io/CharToByteCp948.java \
-	sun/io/CharToByteCp949.java \
-	sun/io/CharToByteCp949C.java \
-	sun/io/CharToByteCp950.java \
-	sun/io/CharToByteCp964.java \
-	sun/io/CharToByteCp970.java \
-	sun/io/CharToByteJIS0201.java \
-	sun/io/CharToByteJIS0208.java \
-	sun/io/CharToByteJIS0208_Solaris.java \
-	sun/io/CharToByteJIS0212.java \
-	sun/io/CharToByteJIS0212_Solaris.java \
-	sun/io/CharToByteEUC_CN.java \
-	sun/io/CharToByteEUC_JP.java \
-	sun/io/CharToByteEUC_JP_LINUX.java \
-	sun/io/CharToByteEUC_JP_Solaris.java \
-	sun/io/CharToByteEUC_KR.java \
-	sun/io/CharToByteEUC_TW.java \
-	sun/io/CharToByteSJIS.java \
-	sun/io/CharToBytePCK.java \
-	sun/io/CharToByteGBK.java \
-	sun/io/CharToByteISCII91.java \
-	sun/io/CharToByteISO2022.java \
-	sun/io/CharToByteISO2022CN_CNS.java \
-	sun/io/CharToByteISO2022CN_GB.java \
-	sun/io/CharToByteISO2022JP.java \
-	sun/io/CharToByteISO2022KR.java \
-	sun/io/CharToByteISO8859_3.java \
-	sun/io/CharToByteISO8859_6.java \
-	sun/io/CharToByteISO8859_8.java \
-	sun/io/CharToByteJohab.java \
-	sun/io/CharToByteMS874.java \
-	sun/io/CharToByteMS932.java \
-	sun/io/CharToByteMS936.java \
-	sun/io/CharToByteMS949.java \
-	sun/io/CharToByteMS950.java \
-	sun/io/CharToByteMacArabic.java \
-	sun/io/CharToByteMacCentralEurope.java \
-	sun/io/CharToByteMacCroatian.java \
-	sun/io/CharToByteMacCyrillic.java \
-	sun/io/CharToByteMacDingbat.java \
-	sun/io/CharToByteMacGreek.java \
-	sun/io/CharToByteMacHebrew.java \
-	sun/io/CharToByteMacIceland.java \
-	sun/io/CharToByteMacRoman.java \
-	sun/io/CharToByteMacRomania.java \
-	sun/io/CharToByteMacSymbol.java \
-	sun/io/CharToByteMacThai.java \
-	sun/io/CharToByteMacTurkish.java \
-	sun/io/CharToByteMacUkraine.java \
-	sun/io/CharToByteTIS620.java
-
 FILES_gen_extcs = \
 	sun/nio/cs/ext/IBM037.java \
 	sun/nio/cs/ext/IBM1006.java \
diff --git a/make/tools/CharsetMapping/SingleByte-X.java.template b/make/tools/CharsetMapping/SingleByte-X.java.template
index d0558e7..4de1faf 100644
--- a/make/tools/CharsetMapping/SingleByte-X.java.template
+++ b/make/tools/CharsetMapping/SingleByte-X.java.template
@@ -55,18 +55,6 @@
         return new SingleByte.Encoder(this, c2b, c2bIndex);
     }
 
-    public String getDecoderSingleByteMappings() {
-        return b2cTable;
-    }
-
-    public char[] getEncoderIndex2() {
-        return c2b;
-    }
-
-    public char[] getEncoderIndex1() {
-        return c2bIndex;
-    }
-
     private final static String b2cTable = $B2CTABLE$
 
     private final static char[] b2c = b2cTable.toCharArray();
diff --git a/src/share/classes/sun/io/ByteToCharASCII.java b/src/share/classes/sun/io/ByteToCharASCII.java
deleted file mode 100644
index b36d239..0000000
--- a/src/share/classes/sun/io/ByteToCharASCII.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A algorithmic conversion from ASCII to Unicode
- *
- * @author Limin Shi
- */
-public class ByteToCharASCII extends ByteToCharConverter {
-
-    // Return the character set id
-    public String getCharacterEncoding()
-    {
-        return "ASCII";
-    }
-
-    public int flush(char[] output, int outStart, int outEnd) {
-        // This converter will not buffer any data.
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    /**
-     * Algorithmic character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws ConversionBufferFullException, UnknownCharacterException
-    {
-        byte    inputByte;
-
-        charOff = outOff;
-        byteOff = inOff;
-
-        // Loop until we hit the end of the input
-        while(byteOff < inEnd)
-        {
-            // If we don't have room for the output, throw an exception
-            if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-
-            // Convert the input byte
-            inputByte = input[byteOff++];
-
-            if (inputByte >= 0)
-                output[charOff++] = (char)inputByte;
-            else {
-                if (subMode)
-                    output[charOff++] = '\uFFFD';       // Replace Char
-                else {
-                    badInputLength = 1;
-                    throw new UnknownCharacterException();
-                }
-            }
-        }
-
-        // Return the length written to the output buffer
-        return charOff-outOff;
-    }
-
-    /*
-     *   Reset after finding bad input
-     */
-    public void reset() {
-        byteOff = charOff = 0;
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharBig5.java b/src/share/classes/sun/io/ByteToCharBig5.java
deleted file mode 100644
index 31b2ce4..0000000
--- a/src/share/classes/sun/io/ByteToCharBig5.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import sun.nio.cs.ext.Big5;
-
-/**
- * Tables and data to convert Big5 to Unicode
- *
- */
-
-public class ByteToCharBig5 extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new Big5().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "Big5";
-    }
-
-    public ByteToCharBig5() {
-        super(dec);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java b/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java
deleted file mode 100644
index dc36675..0000000
--- a/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.Big5_HKSCS;
-import sun.nio.cs.ext.HKSCS;
-import static sun.nio.cs.CharsetMapping.*;
-
-public class ByteToCharBig5_HKSCS extends ByteToCharDBCS_ASCII {
-
-    protected static HKSCS.Decoder dec =
-        (HKSCS.Decoder)new Big5_HKSCS().newDecoder();
-
-
-    public String getCharacterEncoding() {
-        return "Big5_HKSCS";
-    }
-
-    public ByteToCharBig5_HKSCS() {
-        super(dec);
-    }
-
-    protected char decodeDouble(int byte1, int byte2) {
-        char c = dec.decodeDouble(byte1, byte2);
-        if (c == UNMAPPABLE_DECODING)
-            c = dec.decodeBig5(byte1, byte2);
-        return c;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharBig5_Solaris.java b/src/share/classes/sun/io/ByteToCharBig5_Solaris.java
deleted file mode 100644
index a6cd945..0000000
--- a/src/share/classes/sun/io/ByteToCharBig5_Solaris.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import sun.nio.cs.ext.Big5_Solaris;
-
-public class ByteToCharBig5_Solaris extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new Big5_Solaris().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "Big5_Solaris";
-    }
-
-    public ByteToCharBig5_Solaris() {
-        super(dec);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharConverter.java b/src/share/classes/sun/io/ByteToCharConverter.java
deleted file mode 100644
index 99a1f29..0000000
--- a/src/share/classes/sun/io/ByteToCharConverter.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import java.io.*;
-
-
-/**
- * An abstract base class for subclasses which convert character data
- * in an external encoding into Unicode characters.
- *
- * @author Asmus Freytag
- * @author Lloyd Honomichl
- *
- * @deprecated Replaced by {@link java.nio.charset}.  THIS API WILL BE
- * REMOVED IN J2SE 1.6.
- */
-@Deprecated
-public abstract class ByteToCharConverter {
-
-    /*
-     * Substitution mode flag.
-     */
-    protected boolean subMode = true;
-
-    /*
-     * Characters to use for automatic substitution.
-     */
-    protected char[] subChars = { '\uFFFD' };
-
-    /*
-     * Offset of next character to be output
-     */
-    protected int charOff;
-
-    /*
-     * Offset of next byte to be converted
-     */
-    protected int byteOff;
-
-    /*
-     * Length of bad input that caused a MalformedInputException.
-     */
-    protected int badInputLength;
-
-    /**
-     * Create an instance of the default ByteToCharConverter subclass.
-     */
-    public static ByteToCharConverter getDefault() {
-        Object cvt;
-        cvt = Converters.newDefaultConverter(Converters.BYTE_TO_CHAR);
-        return (ByteToCharConverter)cvt;
-    }
-
-    /**
-     * Returns appropriate ByteToCharConverter subclass instance.
-     * @param string represents encoding
-     */
-    public static ByteToCharConverter getConverter(String encoding)
-        throws UnsupportedEncodingException
-    {
-        Object cvt;
-        cvt = Converters.newConverter(Converters.BYTE_TO_CHAR, encoding);
-        return (ByteToCharConverter)cvt;
-    }
-
-    /**
-     * Returns the character set id for the conversion
-     */
-    public abstract String getCharacterEncoding();
-
-    /**
-     * Converts an array of bytes containing characters in an external
-     * encoding into an array of Unicode characters.  This  method allows
-     * a buffer by buffer conversion of a data stream.  The state of the
-     * conversion is saved between calls to convert.  Among other things,
-     * this means multibyte input sequences can be split between calls.
-     * If a call to convert results in an exception, the conversion may be
-     * continued by calling convert again with suitably modified parameters.
-     * All conversions should be finished with a call to the flush method.
-     *
-     * @return the number of bytes written to output.
-     * @param input byte array containing text to be converted.
-     * @param inStart begin conversion at this offset in input array.
-     * @param inEnd stop conversion at this offset in input array (exclusive).
-     * @param output character array to receive conversion result.
-     * @param outStart start writing to output array at this offset.
-     * @param outEnd stop writing to output array at this offset (exclusive).
-     * @exception MalformedInputException if the input buffer contains any
-     * sequence of bytes that is illegal for the input character set.
-     * @exception UnknownCharacterException for any character that
-     * that cannot be converted to Unicode. Thrown only when converter
-     * is not in substitution mode.
-     * @exception ConversionBufferFullException if output array is filled prior
-     * to converting all the input.
-     */
-    public abstract int convert(byte[] input, int inStart, int inEnd,
-                                char[] output, int outStart, int outEnd)
-            throws MalformedInputException,
-                   UnknownCharacterException,
-                   ConversionBufferFullException;
-
-    /**
-     * Converts an array of bytes containing characters in an external
-     * encoding into an array of Unicode characters.  Unlike convert,
-     * this method does not do incremental conversion.  It assumes that
-     * the given input array contains all the characters to be
-     * converted. The state of the converter is reset at the beginning
-     * of this method and is left in the reset state on successful
-     * termination.  The converter is not reset if an exception is
-     * thrown.  This allows the caller to determine where the bad input
-     * was encountered by calling nextByteIndex.
-     * <p>
-     * This method uses substitution mode when performing the
-     * conversion.  The method setSubstitutionChars may be used to
-     * determine what characters are substituted.  Even though substitution
-     * mode is used, the state of the converter's substitution mode is
-     * not changed at the end of this method.
-     *
-     * @return an array of chars containing the converted characters.
-     * @param input array containing Unicode characters to be converted.
-     * @exception MalformedInputException if the input buffer contains any
-     * sequence of chars that is illegal in the input character encoding.
-     * After this exception is thrown,
-     * the method nextByteIndex can be called to obtain the index of the
-     * first invalid input byte and getBadInputLength can be called
-     * to determine the length of the invalid input.
-     *
-     * @see   #nextByteIndex
-     * @see   #setSubstitutionMode
-     * @see   sun.io.CharToByteConverter#setSubstitutionBytes(byte[])
-     * @see   #getBadInputLength
-     */
-    public char[] convertAll( byte input[] ) throws MalformedInputException {
-        reset();
-        boolean savedSubMode = subMode;
-        subMode = true;
-
-        char[] output = new char[ getMaxCharsPerByte() * input.length ];
-
-        try {
-            int outputLength = convert( input, 0, input.length,
-                                        output, 0, output.length );
-            outputLength += flush( output, outputLength, output.length );
-
-            char [] returnedOutput = new char[ outputLength ];
-            System.arraycopy( output, 0, returnedOutput, 0, outputLength );
-            return returnedOutput;
-        }
-        catch( ConversionBufferFullException e ) {
-            //Not supposed to happen.  If it does, getMaxCharsPerByte() lied.
-            throw new
-                InternalError("this.getMaxCharsBerByte returned bad value");
-        }
-        catch( UnknownCharacterException e ) {
-            // Not supposed to happen since we're in substitution mode.
-            throw new InternalError();
-        }
-        finally {
-            subMode = savedSubMode;
-        }
-    }
-
-    /**
-     * Writes any remaining output to the output buffer and resets the
-     * converter to its initial state.
-     *
-     * @param output char array to receive flushed output.
-     * @param outStart start writing to output array at this offset.
-     * @param outEnd stop writing to output array at this offset (exclusive).
-     * @exception MalformedInputException if the output to be flushed contained
-     * a partial or invalid multibyte character sequence.  flush will
-     * write what it can to the output buffer and reset the converter before
-     * throwing this exception.  An additional call to flush is not required.
-     * @exception ConversionBufferFullException if output array is filled
-     * before all the output can be flushed. flush will write what it can
-     * to the output buffer and remember its state.  An additional call to
-     * flush with a new output buffer will conclude the operation.
-     */
-    public abstract int flush( char[] output, int outStart, int outEnd )
-        throws MalformedInputException, ConversionBufferFullException;
-
-    /**
-     * Resets converter to its initial state.
-     */
-    public abstract void reset();
-
-    /**
-     * Returns the maximum number of characters needed to convert a byte. Useful
-     * for calculating the maximum output buffer size needed for a particular
-     * input buffer.
-     */
-    public int getMaxCharsPerByte() {
-        // Until UTF-16, this will do for every encoding
-        return 1;
-    }
-
-    /**
-     * Returns the length, in bytes, of the input which caused a
-     * MalformedInputException.  Always refers to the last
-     * MalformedInputException thrown by the converter.  If none have
-     * ever been thrown, returns 0.
-     */
-    public int getBadInputLength() {
-        return badInputLength;
-    }
-
-    /**
-     * Returns the index of the  character just past the last character
-     * written by the previous call to convert.
-     */
-    public int nextCharIndex() {
-        return charOff;
-    }
-
-    /**
-     * Returns the index of the byte just past the last byte successfully
-     * converted by the previous call to convert.
-     */
-    public int nextByteIndex() {
-        return byteOff;
-    }
-
-    /**
-     * Sets converter into substitution mode.  In substitution mode,
-     * the converter will replace untranslatable characters in the source
-     * encoding with the substitution character set by setSubstitionChars.
-     * When not in substitution mode, the converter will throw an
-     * UnknownCharacterException when it encounters untranslatable input.
-     *
-     * @param doSub if true, enable substitution mode.
-     * @see #setSubstitutionChars
-     */
-    public void setSubstitutionMode(boolean doSub) {
-        subMode = doSub;
-    }
-
-    /**
-     * Sets the substitution characters to use when the converter is in
-     * substitution mode.  The given chars must not be
-     * longer than the value returned by getMaxCharsPerByte for this
-     * converter.
-     *
-     * @param newSubBytes the substitution bytes
-     * @exception IllegalArgumentException if given byte array is longer than
-     *    the value returned by the method getMaxBytesPerChar.
-     * @see #setSubstitutionMode
-     * @see #getMaxBytesPerChar
-     */
-    /**
-     * sets the substitution character to use
-     * @param c the substitution character
-     */
-    public void setSubstitutionChars(char[] c)
-        throws IllegalArgumentException
-    {
-        if( c.length > getMaxCharsPerByte() ) {
-            throw new IllegalArgumentException();
-        }
-
-        subChars = new char[ c.length ];
-        System.arraycopy( c, 0, subChars, 0, c.length );
-    }
-
-    /**
-     * returns a string representation of the character conversion
-     */
-    public String toString() {
-        return "ByteToCharConverter: " + getCharacterEncoding();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp037.java b/src/share/classes/sun/io/ByteToCharCp037.java
deleted file mode 100644
index cc3ce47..0000000
--- a/src/share/classes/sun/io/ByteToCharCp037.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM037;
-
-/**
- * A table to convert to Cp037 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp037 extends ByteToCharSingleByte {
-
-    private final static IBM037 nioCoder = new IBM037();
-
-    public String getCharacterEncoding() {
-        return "Cp037";
-    }
-
-    public ByteToCharCp037() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1006.java b/src/share/classes/sun/io/ByteToCharCp1006.java
deleted file mode 100644
index c7ef9b5..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1006.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1006;
-
-/**
- * A table to convert to Cp1006 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1006 extends ByteToCharSingleByte {
-
-    private final static IBM1006 nioCoder = new IBM1006();
-
-    public String getCharacterEncoding() {
-        return "Cp1006";
-    }
-
-    public ByteToCharCp1006() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1025.java b/src/share/classes/sun/io/ByteToCharCp1025.java
deleted file mode 100644
index 21f960d..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1025.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1025;
-
-/**
- * A table to convert to Cp1025 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1025 extends ByteToCharSingleByte {
-
-    private final static IBM1025 nioCoder = new IBM1025();
-
-    public String getCharacterEncoding() {
-        return "Cp1025";
-    }
-
-    public ByteToCharCp1025() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1026.java b/src/share/classes/sun/io/ByteToCharCp1026.java
deleted file mode 100644
index d09eadb..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1026.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1026;
-
-/**
- * A table to convert to Cp1026 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1026 extends ByteToCharSingleByte {
-
-    private final static IBM1026 nioCoder = new IBM1026();
-
-    public String getCharacterEncoding() {
-        return "Cp1026";
-    }
-
-    public ByteToCharCp1026() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1046.java b/src/share/classes/sun/io/ByteToCharCp1046.java
deleted file mode 100644
index 6a99f4f..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1046.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1046;
-
-/**
- * A table to convert to Cp1046 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1046 extends ByteToCharSingleByte {
-
-    private final static IBM1046 nioCoder = new IBM1046();
-
-    public String getCharacterEncoding() {
-        return "Cp1046";
-    }
-
-    public ByteToCharCp1046() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1047.java b/src/share/classes/sun/io/ByteToCharCp1047.java
deleted file mode 100644
index 0dd8743..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1047.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1047;
-
-/**
- * A table to convert to Cp1047 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1047 extends ByteToCharSingleByte {
-
-    private final static IBM1047 nioCoder = new IBM1047();
-
-    public String getCharacterEncoding() {
-        return "Cp1047";
-    }
-
-    public ByteToCharCp1047() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1097.java b/src/share/classes/sun/io/ByteToCharCp1097.java
deleted file mode 100644
index ca64a1f..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1097.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1097;
-
-/**
- * A table to convert to Cp1097 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1097 extends ByteToCharSingleByte {
-
-    private final static IBM1097 nioCoder = new IBM1097();
-
-    public String getCharacterEncoding() {
-        return "Cp1097";
-    }
-
-    public ByteToCharCp1097() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1098.java b/src/share/classes/sun/io/ByteToCharCp1098.java
deleted file mode 100644
index b2f28c3..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1098.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1098;
-
-/**
- * A table to convert to Cp1098 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1098 extends ByteToCharSingleByte {
-
-    private final static IBM1098 nioCoder = new IBM1098();
-
-    public String getCharacterEncoding() {
-        return "Cp1098";
-    }
-
-    public ByteToCharCp1098() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1112.java b/src/share/classes/sun/io/ByteToCharCp1112.java
deleted file mode 100644
index 582ffad..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1112.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1112;
-
-/**
- * A table to convert to Cp1112 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1112 extends ByteToCharSingleByte {
-
-    private final static IBM1112 nioCoder = new IBM1112();
-
-    public String getCharacterEncoding() {
-        return "Cp1112";
-    }
-
-    public ByteToCharCp1112() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1122.java b/src/share/classes/sun/io/ByteToCharCp1122.java
deleted file mode 100644
index 8719bf2..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1122.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1122;
-
-/**
- * A table to convert to Cp1122 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1122 extends ByteToCharSingleByte {
-
-    private final static IBM1122 nioCoder = new IBM1122();
-
-    public String getCharacterEncoding() {
-        return "Cp1122";
-    }
-
-    public ByteToCharCp1122() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1123.java b/src/share/classes/sun/io/ByteToCharCp1123.java
deleted file mode 100644
index 13feb79..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1123.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1123;
-
-/**
- * A table to convert to Cp1123 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1123 extends ByteToCharSingleByte {
-
-    private final static IBM1123 nioCoder = new IBM1123();
-
-    public String getCharacterEncoding() {
-        return "Cp1123";
-    }
-
-    public ByteToCharCp1123() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1124.java b/src/share/classes/sun/io/ByteToCharCp1124.java
deleted file mode 100644
index 00d4fcc..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1124.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1124;
-
-/**
- * A table to convert to Cp1124 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1124 extends ByteToCharSingleByte {
-
-    private final static IBM1124 nioCoder = new IBM1124();
-
-    public String getCharacterEncoding() {
-        return "Cp1124";
-    }
-
-    public ByteToCharCp1124() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1140.java b/src/share/classes/sun/io/ByteToCharCp1140.java
deleted file mode 100644
index 96a82a9..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1140.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1140 to Unicode.  This converter differs from
- * Cp037 is one code point, 0x9F, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1140 extends ByteToCharCp037 {
-    public ByteToCharCp1140() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1140";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // Cast to byte to get sign extension to match byteIndex.
-        return (byteIndex == (byte)0x9F) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1141.java b/src/share/classes/sun/io/ByteToCharCp1141.java
deleted file mode 100644
index ea14cb9..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1141.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1141 to Unicode.  This converter differs from
- * Cp273 is one code point, 0x9F, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1141 extends ByteToCharCp273 {
-    public ByteToCharCp1141() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1141";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // Cast to byte to get sign extension to match byteIndex.
-        return (byteIndex == (byte)0x9F) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1142.java b/src/share/classes/sun/io/ByteToCharCp1142.java
deleted file mode 100644
index 5097d72..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1142.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1142 to Unicode.  This converter differs from
- * Cp277 is one code point, 0x5A, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1142 extends ByteToCharCp277 {
-    public ByteToCharCp1142() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1142";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // [Careful -- if the code point in question is >= 0x80, make
-        //  sure you do the comparison like this: (byteIndex == (byte)0x??)]
-        return (byteIndex == 0x5A) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1143.java b/src/share/classes/sun/io/ByteToCharCp1143.java
deleted file mode 100644
index a3b0ed9..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1143.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1143 to Unicode.  This converter differs from
- * Cp278 is one code point, 0x5A, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1143 extends ByteToCharCp278 {
-    public ByteToCharCp1143() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1143";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // [Careful -- if the code point in question is >= 0x80, make
-        //  sure you do the comparison like this: (byteIndex == (byte)0x??)]
-        return (byteIndex == 0x5A) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1144.java b/src/share/classes/sun/io/ByteToCharCp1144.java
deleted file mode 100644
index cb6bb7d..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1144.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1144 to Unicode.  This converter differs from
- * Cp280 is one code point, 0x9F, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1144 extends ByteToCharCp280 {
-    public ByteToCharCp1144() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1144";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // Cast to byte to get sign extension to match byteIndex.
-        return (byteIndex == (byte)0x9F) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1145.java b/src/share/classes/sun/io/ByteToCharCp1145.java
deleted file mode 100644
index a11b819..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1145.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1145 to Unicode.  This converter differs from
- * Cp284 is one code point, 0x9F, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1145 extends ByteToCharCp284 {
-    public ByteToCharCp1145() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1145";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // Cast to byte to get sign extension to match byteIndex.
-        return (byteIndex == (byte)0x9F) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1146.java b/src/share/classes/sun/io/ByteToCharCp1146.java
deleted file mode 100644
index 017f60f..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1146.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1146 to Unicode.  This converter differs from
- * Cp285 is one code point, 0x9F, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1146 extends ByteToCharCp285 {
-    public ByteToCharCp1146() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1146";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // Cast to byte to get sign extension to match byteIndex.
-        return (byteIndex == (byte)0x9F) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1147.java b/src/share/classes/sun/io/ByteToCharCp1147.java
deleted file mode 100644
index 98926bb..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1147.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1147 to Unicode.  This converter differs from
- * Cp297 is one code point, 0x9F, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1147 extends ByteToCharCp297 {
-    public ByteToCharCp1147() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1147";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // Cast to byte to get sign extension to match byteIndex.
-        return (byteIndex == (byte)0x9F) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1148.java b/src/share/classes/sun/io/ByteToCharCp1148.java
deleted file mode 100644
index 90bd067..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1148.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1148 to Unicode.  This converter differs from
- * Cp500 is one code point, 0x9F, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1148 extends ByteToCharCp500 {
-    public ByteToCharCp1148() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1148";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // Cast to byte to get sign extension to match byteIndex.
-        return (byteIndex == (byte)0x9F) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1149.java b/src/share/classes/sun/io/ByteToCharCp1149.java
deleted file mode 100644
index 105e737..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1149.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp1149 to Unicode.  This converter differs from
- * Cp871 is one code point, 0x9F, which changes from \u00A4 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp1149 extends ByteToCharCp871 {
-    public ByteToCharCp1149() {}
-
-    public String getCharacterEncoding() {
-        return "Cp1149";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // Cast to byte to get sign extension to match byteIndex.
-        return (byteIndex == (byte)0x9F) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp1250.java b/src/share/classes/sun/io/ByteToCharCp1250.java
deleted file mode 100644
index a493cd6..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1250.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.MS1250;
-
-/**
- * A table to convert Cp1250 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1250 extends ByteToCharSingleByte {
-
-    private final static MS1250 nioCoder = new MS1250();
-
-    public String getCharacterEncoding() {
-        return "Cp1250";
-    }
-
-    public ByteToCharCp1250() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1251.java b/src/share/classes/sun/io/ByteToCharCp1251.java
deleted file mode 100644
index b337e35..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1251.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.MS1251;
-
-/**
- * A table to convert Cp1251 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1251 extends ByteToCharSingleByte {
-
-    private final static MS1251 nioCoder = new MS1251();
-
-    public String getCharacterEncoding() {
-        return "Cp1251";
-    }
-
-    public ByteToCharCp1251() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1252.java b/src/share/classes/sun/io/ByteToCharCp1252.java
deleted file mode 100644
index bd1e764..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1252.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.MS1252;
-
-/**
- * A table to convert Cp1252 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1252 extends ByteToCharSingleByte {
-
-    private final static MS1252 nioCoder = new MS1252();
-
-    public String getCharacterEncoding() {
-        return "Cp1252";
-    }
-
-    public ByteToCharCp1252() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1253.java b/src/share/classes/sun/io/ByteToCharCp1253.java
deleted file mode 100644
index fdf0470..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1253.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.MS1253;
-
-/**
- * A table to convert Cp1253 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1253 extends ByteToCharSingleByte {
-
-    private final static MS1253 nioCoder = new MS1253();
-
-    public String getCharacterEncoding() {
-        return "Cp1253";
-    }
-
-    public ByteToCharCp1253() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1254.java b/src/share/classes/sun/io/ByteToCharCp1254.java
deleted file mode 100644
index f370e04..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1254.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.MS1254;
-
-/**
- * A table to convert Cp1254 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1254 extends ByteToCharSingleByte {
-
-    private final static MS1254 nioCoder = new MS1254();
-
-    public String getCharacterEncoding() {
-        return "Cp1254";
-    }
-
-    public ByteToCharCp1254() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1255.java b/src/share/classes/sun/io/ByteToCharCp1255.java
deleted file mode 100644
index f703761..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1255.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MS1255;
-
-/**
- * A table to convert Cp1255 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1255 extends ByteToCharSingleByte {
-
-    private final static MS1255 nioCoder = new MS1255();
-
-    public String getCharacterEncoding() {
-        return "Cp1255";
-    }
-
-    public ByteToCharCp1255() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1256.java b/src/share/classes/sun/io/ByteToCharCp1256.java
deleted file mode 100644
index ce7edd1..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1256.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MS1256;
-
-/**
- * A table to convert Cp1256 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1256 extends ByteToCharSingleByte {
-
-    private final static MS1256 nioCoder = new MS1256();
-
-    public String getCharacterEncoding() {
-        return "Cp1256";
-    }
-
-    public ByteToCharCp1256() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1257.java b/src/share/classes/sun/io/ByteToCharCp1257.java
deleted file mode 100644
index 2691caf..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1257.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.MS1257;
-
-/**
- * A table to convert Cp1257 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1257 extends ByteToCharSingleByte {
-
-    private final static MS1257 nioCoder = new MS1257();
-
-    public String getCharacterEncoding() {
-        return "Cp1257";
-    }
-
-    public ByteToCharCp1257() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1258.java b/src/share/classes/sun/io/ByteToCharCp1258.java
deleted file mode 100644
index 70b101c..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1258.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MS1258;
-
-/**
- * A table to convert Cp1258 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp1258 extends ByteToCharSingleByte {
-
-    private final static MS1258 nioCoder = new MS1258();
-
-    public String getCharacterEncoding() {
-        return "Cp1258";
-    }
-
-    public ByteToCharCp1258() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1381.java b/src/share/classes/sun/io/ByteToCharCp1381.java
deleted file mode 100644
index c38b96b..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1381.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp1381 extends ByteToCharDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp1381";
-    }
-
-    public ByteToCharCp1381() {
-        super((DoubleByte.Decoder)new IBM1381().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp1383.java b/src/share/classes/sun/io/ByteToCharCp1383.java
deleted file mode 100644
index cf0b06e..0000000
--- a/src/share/classes/sun/io/ByteToCharCp1383.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp1383 extends ByteToCharEUC2 {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp1383";
-    }
-
-    public ByteToCharCp1383() {
-        super((DoubleByte.Decoder)new IBM1383().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp273.java b/src/share/classes/sun/io/ByteToCharCp273.java
deleted file mode 100644
index af0cbc6..0000000
--- a/src/share/classes/sun/io/ByteToCharCp273.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM273;
-
-/**
- * A table to convert to Cp273 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp273 extends ByteToCharSingleByte {
-
-    private final static IBM273 nioCoder = new IBM273();
-
-    public String getCharacterEncoding() {
-        return "Cp273";
-    }
-
-    public ByteToCharCp273() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp277.java b/src/share/classes/sun/io/ByteToCharCp277.java
deleted file mode 100644
index fd749ea..0000000
--- a/src/share/classes/sun/io/ByteToCharCp277.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM277;
-
-/**
- * A table to convert to Cp277 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp277 extends ByteToCharSingleByte {
-
-    private final static IBM277 nioCoder = new IBM277();
-
-    public String getCharacterEncoding() {
-        return "Cp277";
-    }
-
-    public ByteToCharCp277() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp278.java b/src/share/classes/sun/io/ByteToCharCp278.java
deleted file mode 100644
index 334c587..0000000
--- a/src/share/classes/sun/io/ByteToCharCp278.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM278;
-
-/**
- * A table to convert to Cp278 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp278 extends ByteToCharSingleByte {
-
-    private final static IBM278 nioCoder = new IBM278();
-
-    public String getCharacterEncoding() {
-        return "Cp278";
-    }
-
-    public ByteToCharCp278() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp280.java b/src/share/classes/sun/io/ByteToCharCp280.java
deleted file mode 100644
index 72cb21c..0000000
--- a/src/share/classes/sun/io/ByteToCharCp280.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM280;
-
-/**
- * A table to convert to Cp280 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp280 extends ByteToCharSingleByte {
-
-    private final static IBM280 nioCoder = new IBM280();
-
-    public String getCharacterEncoding() {
-        return "Cp280";
-    }
-
-    public ByteToCharCp280() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp284.java b/src/share/classes/sun/io/ByteToCharCp284.java
deleted file mode 100644
index 83089d9..0000000
--- a/src/share/classes/sun/io/ByteToCharCp284.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM284;
-
-/**
- * A table to convert to Cp284 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp284 extends ByteToCharSingleByte {
-
-    private final static IBM284 nioCoder = new IBM284();
-
-    public String getCharacterEncoding() {
-        return "Cp284";
-    }
-
-    public ByteToCharCp284() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp285.java b/src/share/classes/sun/io/ByteToCharCp285.java
deleted file mode 100644
index d652f40..0000000
--- a/src/share/classes/sun/io/ByteToCharCp285.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM285;
-
-/**
- * A table to convert to Cp285 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp285 extends ByteToCharSingleByte {
-
-    private final static IBM285 nioCoder = new IBM285();
-
-    public String getCharacterEncoding() {
-        return "Cp285";
-    }
-
-    public ByteToCharCp285() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp297.java b/src/share/classes/sun/io/ByteToCharCp297.java
deleted file mode 100644
index 67fed6d..0000000
--- a/src/share/classes/sun/io/ByteToCharCp297.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM297;
-
-/**
- * A table to convert to Cp297 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp297 extends ByteToCharSingleByte {
-
-    private final static IBM297 nioCoder = new IBM297();
-
-    public String getCharacterEncoding() {
-        return "Cp297";
-    }
-
-    public ByteToCharCp297() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp33722.java b/src/share/classes/sun/io/ByteToCharCp33722.java
deleted file mode 100644
index 68db184..0000000
--- a/src/share/classes/sun/io/ByteToCharCp33722.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.IBM33722;
-
-/**
-* @author Malcolm Ayres
-*/
-public class ByteToCharCp33722 extends ByteToCharConverter
-{
-    private final int G0 = 0;
-    private final int G1 = 1;
-    private final int G2 = 2;
-    private final int G3 = 3;
-    private final int G4 = 4;
-    private final int SS2 =  0x8E;
-    private final int SS3 =  0x8F;
-
-    private int firstByte, state;
-    private String byteToCharTable;
-    private String mappingTableG1;
-    private String mappingTableG2;
-    private String mappingTableG3;
-
-    private final static IBM33722 nioCoder = new IBM33722();
-
-    public ByteToCharCp33722() {
-        super();
-        state = G0;
-        byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-        mappingTableG1 = nioCoder.getDecoderMappingTableG1();
-        mappingTableG2 = nioCoder.getDecoderMappingTableG2();
-        mappingTableG3 = nioCoder.getDecoderMappingTableG3();
-    }
-
-    /**
-      * Return the character set id
-      */
-    public String getCharacterEncoding()
-    {
-       return "Cp33722";
-    }
-
-    /**
-      * flush out any residual data and reset the buffer state
-      */
-    public int flush(char[] output, int outStart, int outEnd)
-       throws MalformedInputException
-    {
-        if (state != G0) {
-            reset();
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-
-        reset();
-        return 0;
-    }
-
-    /**
-     *  Resets the converter.
-     */
-    public void reset() {
-        state = G0;
-        charOff = byteOff = 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-
-       int       byte1;
-       char      outputChar = '\uFFFD';
-
-       byteOff = inOff;
-       charOff = outOff;
-
-       while (byteOff < inEnd) {
-
-          byte1 = input[byteOff];
-          if (byte1 < 0)
-            byte1 += 256;
-
-          switch (state) {
-             case G0:
-                if (byte1 == SS2)                       // drop into G2 set
-                   state = G2;
-                else if (byte1 == SS3)                  // drop into G3 set
-                   state = G3;
-                else if ( byte1 <= 0x9f )               // valid single byte
-                   outputChar = byteToCharTable.charAt(byte1);
-                else if (byte1 < 0xa1 || byte1 > 0xfe) {  // valid G1 set 1st byte
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                } else {
-                   firstByte = byte1;                   // save the 1st byte
-                   state = G1;
-                }
-                break;
-
-             case G1:
-                state = G0;
-                if ( byte1 < 0xa1 || byte1 > 0xfe) {    // valid second byte for G1
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-                outputChar = mappingTableG1.charAt(((firstByte - 0xa1) * 94)  + byte1 - 0xa1);
-                break;
-
-             case G2:
-                state = G0;                             // valid first byte for G2
-                if ( byte1 < 0xa1 || byte1 > 0xfe) {
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-                outputChar = mappingTableG2.charAt(byte1 - 0xa1);
-                break;
-
-             case G3:
-                if ( byte1 < 0xa1 || byte1 > 0xfe) {    // valid first byte for G3
-                   state = G0;
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-                firstByte = byte1;
-                state = G4;
-                break;
-
-             case G4:
-                state = G0;                             // valid second byte for G3
-                if ( byte1 < 0xa1 || byte1 > 0xfe) {
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-                outputChar = mappingTableG3.charAt(((firstByte - 0xa1) * 94)  + byte1 - 0xa1);
-                break;
-
-          }
-
-          if (state == G0) {
-             if (outputChar == '\uFFFD') {
-                if (subMode)
-                   outputChar = subChars[0];
-                else {
-                   badInputLength = 1;
-                   throw new UnknownCharacterException();
-                }
-             }
-
-             if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-
-             output[charOff++] = outputChar;
-          }
-
-          byteOff++;
-
-       }
-
-       return charOff - outOff;
-
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp420.java b/src/share/classes/sun/io/ByteToCharCp420.java
deleted file mode 100644
index 17a80a1..0000000
--- a/src/share/classes/sun/io/ByteToCharCp420.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM420;
-
-/**
- * A table to convert to Cp420 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp420 extends ByteToCharSingleByte {
-
-    private final static IBM420 nioCoder = new IBM420();
-
-    public String getCharacterEncoding() {
-        return "Cp420";
-    }
-
-    public ByteToCharCp420() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp424.java b/src/share/classes/sun/io/ByteToCharCp424.java
deleted file mode 100644
index be4d135..0000000
--- a/src/share/classes/sun/io/ByteToCharCp424.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM424;
-
-/**
- * A table to convert to Cp424 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp424 extends ByteToCharSingleByte {
-
-    private final static IBM424 nioCoder = new IBM424();
-
-    public String getCharacterEncoding() {
-        return "Cp424";
-    }
-
-    public ByteToCharCp424() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp437.java b/src/share/classes/sun/io/ByteToCharCp437.java
deleted file mode 100644
index d509f42..0000000
--- a/src/share/classes/sun/io/ByteToCharCp437.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.IBM437;
-
-/**
- * A table to convert to Cp437 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp437 extends ByteToCharSingleByte {
-
-    private final static IBM437 nioCoder = new IBM437();
-
-    public String getCharacterEncoding() {
-        return "Cp437";
-    }
-
-    public ByteToCharCp437() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp500.java b/src/share/classes/sun/io/ByteToCharCp500.java
deleted file mode 100644
index 41e488f..0000000
--- a/src/share/classes/sun/io/ByteToCharCp500.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM500;
-
-/**
- * A table to convert to Cp500 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp500 extends ByteToCharSingleByte {
-
-    private final static IBM500 nioCoder = new IBM500();
-
-    public String getCharacterEncoding() {
-        return "Cp500";
-    }
-
-    public ByteToCharCp500() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp737.java b/src/share/classes/sun/io/ByteToCharCp737.java
deleted file mode 100644
index e7ca4d3..0000000
--- a/src/share/classes/sun/io/ByteToCharCp737.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.IBM737;
-
-/**
- * A table to convert to Cp737 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp737 extends ByteToCharSingleByte {
-
-    private final static IBM737 nioCoder = new IBM737();
-
-    public String getCharacterEncoding() {
-        return "Cp737";
-    }
-
-    public ByteToCharCp737() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp775.java b/src/share/classes/sun/io/ByteToCharCp775.java
deleted file mode 100644
index 3e06491..0000000
--- a/src/share/classes/sun/io/ByteToCharCp775.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.IBM775;
-
-/**
- * A table to convert to Cp775 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp775 extends ByteToCharSingleByte {
-
-    private final static IBM775 nioCoder = new IBM775();
-
-    public String getCharacterEncoding() {
-        return "Cp775";
-    }
-
-    public ByteToCharCp775() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp833.java b/src/share/classes/sun/io/ByteToCharCp833.java
deleted file mode 100644
index 6549828..0000000
--- a/src/share/classes/sun/io/ByteToCharCp833.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM833;
-
-public class ByteToCharCp833 extends ByteToCharSingleByte {
-
-    private final static IBM833 nioCoder = new IBM833();
-
-    public String getCharacterEncoding() {
-        return "Cp833";
-    }
-
-    public ByteToCharCp833() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
-
diff --git a/src/share/classes/sun/io/ByteToCharCp834.java b/src/share/classes/sun/io/ByteToCharCp834.java
deleted file mode 100644
index 2019a6b..0000000
--- a/src/share/classes/sun/io/ByteToCharCp834.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp834 extends ByteToCharDBCS_ASCII {
-
-    public String getCharacterEncoding() {
-        return "Cp834";
-    }
-
-    public ByteToCharCp834() {
-        super((DoubleByte.Decoder)new IBM834().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp838.java b/src/share/classes/sun/io/ByteToCharCp838.java
deleted file mode 100644
index 74166ab..0000000
--- a/src/share/classes/sun/io/ByteToCharCp838.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM838;
-
-/**
- * A table to convert to Cp838 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp838 extends ByteToCharSingleByte {
-
-    private final static IBM838 nioCoder = new IBM838();
-
-    public String getCharacterEncoding() {
-        return "Cp838";
-    }
-
-    public ByteToCharCp838() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp850.java b/src/share/classes/sun/io/ByteToCharCp850.java
deleted file mode 100644
index 1713108..0000000
--- a/src/share/classes/sun/io/ByteToCharCp850.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM850;
-
-/**
- * A table to convert to Cp850 to Unicode
- *
- * @author  ConverterGenerator tool
- * @version >= JDK1.1.6
- */
-
-public class ByteToCharCp850 extends ByteToCharSingleByte {
-
-    public String getCharacterEncoding() {
-        return "Cp850";
-    }
-
-    public ByteToCharCp850() {
-        super.byteToCharTable = new IBM850().getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp852.java b/src/share/classes/sun/io/ByteToCharCp852.java
deleted file mode 100644
index 851eb2b..0000000
--- a/src/share/classes/sun/io/ByteToCharCp852.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.IBM852;
-
-/**
- * A table to convert to Cp852 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp852 extends ByteToCharSingleByte {
-
-    private final static IBM852 nioCoder = new IBM852();
-
-    public String getCharacterEncoding() {
-        return "Cp852";
-    }
-
-    public ByteToCharCp852() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp855.java b/src/share/classes/sun/io/ByteToCharCp855.java
deleted file mode 100644
index dc48df3..0000000
--- a/src/share/classes/sun/io/ByteToCharCp855.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.IBM855;
-
-/**
- * A table to convert to Cp855 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp855 extends ByteToCharSingleByte {
-
-    private final static IBM855 nioCoder = new IBM855();
-
-    public String getCharacterEncoding() {
-        return "Cp855";
-    }
-
-    public ByteToCharCp855() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp856.java b/src/share/classes/sun/io/ByteToCharCp856.java
deleted file mode 100644
index 404d237..0000000
--- a/src/share/classes/sun/io/ByteToCharCp856.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM856;
-
-/**
- * A table to convert to Cp856 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp856 extends ByteToCharSingleByte {
-
-    private final static IBM856 nioCoder = new IBM856();
-
-    public String getCharacterEncoding() {
-        return "Cp856";
-    }
-
-    public ByteToCharCp856() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp857.java b/src/share/classes/sun/io/ByteToCharCp857.java
deleted file mode 100644
index 16dbb9d..0000000
--- a/src/share/classes/sun/io/ByteToCharCp857.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.IBM857;
-
-/**
- * A table to convert to Cp857 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp857 extends ByteToCharSingleByte {
-
-    private final static IBM857 nioCoder = new IBM857();
-
-    public String getCharacterEncoding() {
-        return "Cp857";
-    }
-
-    public ByteToCharCp857() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp858.java b/src/share/classes/sun/io/ByteToCharCp858.java
deleted file mode 100644
index 480c67b..0000000
--- a/src/share/classes/sun/io/ByteToCharCp858.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert Cp858 to Unicode.  This converter differs from
- * Cp850 is one code point, 0xD5, which changes from \u0131 to \u20AC.
- * @author  Alan Liu
- */
-public class ByteToCharCp858 extends ByteToCharCp850 {
-    public ByteToCharCp858() {}
-
-    public String getCharacterEncoding() {
-        return "Cp858";
-    }
-
-    protected char getUnicode(int byteIndex) {
-        // Change single code point with respect to parent.
-        // Cast to byte to get sign extension to match byteIndex.
-        return (byteIndex == (byte)0xD5) ? '\u20AC' : super.getUnicode(byteIndex);
-    }
-}
-
-//eof
diff --git a/src/share/classes/sun/io/ByteToCharCp860.java b/src/share/classes/sun/io/ByteToCharCp860.java
deleted file mode 100644
index 0b9ec7c..0000000
--- a/src/share/classes/sun/io/ByteToCharCp860.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM860;
-
-/**
- * A table to convert to Cp860 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp860 extends ByteToCharSingleByte {
-
-    private final static IBM860 nioCoder = new IBM860();
-
-    public String getCharacterEncoding() {
-        return "Cp860";
-    }
-
-    public ByteToCharCp860() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp861.java b/src/share/classes/sun/io/ByteToCharCp861.java
deleted file mode 100644
index 450e5bd..0000000
--- a/src/share/classes/sun/io/ByteToCharCp861.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM861;
-
-/**
- * A table to convert to Cp861 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp861 extends ByteToCharSingleByte {
-
-    private final static IBM861 nioCoder = new IBM861();
-
-    public String getCharacterEncoding() {
-        return "Cp861";
-    }
-
-    public ByteToCharCp861() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp862.java b/src/share/classes/sun/io/ByteToCharCp862.java
deleted file mode 100644
index b0420dd..0000000
--- a/src/share/classes/sun/io/ByteToCharCp862.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.IBM862;
-
-/**
- * A table to convert to Cp862 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp862 extends ByteToCharSingleByte {
-
-    private final static IBM862 nioCoder = new IBM862();
-
-    public String getCharacterEncoding() {
-        return "Cp862";
-    }
-
-    public ByteToCharCp862() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp863.java b/src/share/classes/sun/io/ByteToCharCp863.java
deleted file mode 100644
index 7dcd64c..0000000
--- a/src/share/classes/sun/io/ByteToCharCp863.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM863;
-
-/**
- * A table to convert to Cp863 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp863 extends ByteToCharSingleByte {
-
-    private final static IBM863 nioCoder = new IBM863();
-
-    public String getCharacterEncoding() {
-        return "Cp863";
-    }
-
-    public ByteToCharCp863() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp864.java b/src/share/classes/sun/io/ByteToCharCp864.java
deleted file mode 100644
index 7aa11fa..0000000
--- a/src/share/classes/sun/io/ByteToCharCp864.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM864;
-
-/**
- * A table to convert to Cp864 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp864 extends ByteToCharSingleByte {
-
-    private final static IBM864 nioCoder = new IBM864();
-
-    public String getCharacterEncoding() {
-        return "Cp864";
-    }
-
-    public ByteToCharCp864() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp865.java b/src/share/classes/sun/io/ByteToCharCp865.java
deleted file mode 100644
index 75e0fef..0000000
--- a/src/share/classes/sun/io/ByteToCharCp865.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM865;
-
-/**
- * A table to convert to Cp865 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp865 extends ByteToCharSingleByte {
-
-    private final static IBM865 nioCoder = new IBM865();
-
-    public String getCharacterEncoding() {
-        return "Cp865";
-    }
-
-    public ByteToCharCp865() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp866.java b/src/share/classes/sun/io/ByteToCharCp866.java
deleted file mode 100644
index df47322..0000000
--- a/src/share/classes/sun/io/ByteToCharCp866.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.IBM866;
-
-/**
- * A table to convert to Cp866 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp866 extends ByteToCharSingleByte {
-
-    private final static IBM866 nioCoder = new IBM866();
-
-    public String getCharacterEncoding() {
-        return "Cp866";
-    }
-
-    public ByteToCharCp866() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp868.java b/src/share/classes/sun/io/ByteToCharCp868.java
deleted file mode 100644
index af21983..0000000
--- a/src/share/classes/sun/io/ByteToCharCp868.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM868;
-
-/**
- * A table to convert to Cp868 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp868 extends ByteToCharSingleByte {
-
-    private final static IBM868 nioCoder = new IBM868();
-
-    public String getCharacterEncoding() {
-        return "Cp868";
-    }
-
-    public ByteToCharCp868() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp869.java b/src/share/classes/sun/io/ByteToCharCp869.java
deleted file mode 100644
index 10f6576..0000000
--- a/src/share/classes/sun/io/ByteToCharCp869.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM869;
-
-/**
- * A table to convert to Cp869 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp869 extends ByteToCharSingleByte {
-
-    private final static IBM869 nioCoder = new IBM869();
-
-    public String getCharacterEncoding() {
-        return "Cp869";
-    }
-
-    public ByteToCharCp869() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp870.java b/src/share/classes/sun/io/ByteToCharCp870.java
deleted file mode 100644
index 463d1ef..0000000
--- a/src/share/classes/sun/io/ByteToCharCp870.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM870;
-
-/**
- * A table to convert to Cp870 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp870 extends ByteToCharSingleByte {
-
-    private final static IBM870 nioCoder = new IBM870();
-
-    public String getCharacterEncoding() {
-        return "Cp870";
-    }
-
-    public ByteToCharCp870() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp871.java b/src/share/classes/sun/io/ByteToCharCp871.java
deleted file mode 100644
index b6a59ad..0000000
--- a/src/share/classes/sun/io/ByteToCharCp871.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM871;
-
-/**
- * A table to convert to Cp871 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp871 extends ByteToCharSingleByte {
-
-    private final static IBM871 nioCoder = new IBM871();
-
-    public String getCharacterEncoding() {
-        return "Cp871";
-    }
-
-    public ByteToCharCp871() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp874.java b/src/share/classes/sun/io/ByteToCharCp874.java
deleted file mode 100644
index 0eabc28..0000000
--- a/src/share/classes/sun/io/ByteToCharCp874.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.IBM874;
-
-/**
- * A table to convert to Cp874 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp874 extends ByteToCharSingleByte {
-
-    private final static IBM874 nioCoder = new IBM874();
-
-    public String getCharacterEncoding() {
-        return "Cp874";
-    }
-
-    public ByteToCharCp874() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp875.java b/src/share/classes/sun/io/ByteToCharCp875.java
deleted file mode 100644
index c08e956..0000000
--- a/src/share/classes/sun/io/ByteToCharCp875.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM875;
-
-/**
- * A table to convert to Cp875 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp875 extends ByteToCharSingleByte {
-
-    private final static IBM875 nioCoder = new IBM875();
-
-    public String getCharacterEncoding() {
-        return "Cp875";
-    }
-
-    public ByteToCharCp875() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp918.java b/src/share/classes/sun/io/ByteToCharCp918.java
deleted file mode 100644
index 858b311..0000000
--- a/src/share/classes/sun/io/ByteToCharCp918.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM918;
-
-/**
- * A table to convert to Cp918 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp918 extends ByteToCharSingleByte {
-
-    private final static IBM918 nioCoder = new IBM918();
-
-    public String getCharacterEncoding() {
-        return "Cp918";
-    }
-
-    public ByteToCharCp918() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp921.java b/src/share/classes/sun/io/ByteToCharCp921.java
deleted file mode 100644
index 4105b07..0000000
--- a/src/share/classes/sun/io/ByteToCharCp921.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM921;
-
-/**
- * A table to convert to Cp921 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp921 extends ByteToCharSingleByte {
-
-    private final static IBM921 nioCoder = new IBM921();
-
-    public String getCharacterEncoding() {
-        return "Cp921";
-    }
-
-    public ByteToCharCp921() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp922.java b/src/share/classes/sun/io/ByteToCharCp922.java
deleted file mode 100644
index fa66bea..0000000
--- a/src/share/classes/sun/io/ByteToCharCp922.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM922;
-
-/**
- * A table to convert to Cp922 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharCp922 extends ByteToCharSingleByte {
-
-    private final static IBM922 nioCoder = new IBM922();
-
-    public String getCharacterEncoding() {
-        return "Cp922";
-    }
-
-    public ByteToCharCp922() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp930.java b/src/share/classes/sun/io/ByteToCharCp930.java
deleted file mode 100644
index 0e47346..0000000
--- a/src/share/classes/sun/io/ByteToCharCp930.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp930 extends ByteToCharDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp930";
-    }
-
-    public ByteToCharCp930() {
-        super((DoubleByte.Decoder)new IBM930().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp933.java b/src/share/classes/sun/io/ByteToCharCp933.java
deleted file mode 100644
index 6310f2d..0000000
--- a/src/share/classes/sun/io/ByteToCharCp933.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp933 extends ByteToCharDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp933";
-    }
-
-    public ByteToCharCp933() {
-        super((DoubleByte.Decoder)new IBM933().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp935.java b/src/share/classes/sun/io/ByteToCharCp935.java
deleted file mode 100644
index 2c67eec..0000000
--- a/src/share/classes/sun/io/ByteToCharCp935.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp935 extends ByteToCharDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp935";
-    }
-
-    public ByteToCharCp935() {
-        super((DoubleByte.Decoder)new IBM935().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp937.java b/src/share/classes/sun/io/ByteToCharCp937.java
deleted file mode 100644
index cd4ed0e..0000000
--- a/src/share/classes/sun/io/ByteToCharCp937.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp937 extends ByteToCharDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp937";
-    }
-
-    public ByteToCharCp937() {
-        super((DoubleByte.Decoder)new IBM937().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp939.java b/src/share/classes/sun/io/ByteToCharCp939.java
deleted file mode 100644
index e4d81b1..0000000
--- a/src/share/classes/sun/io/ByteToCharCp939.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp939 extends ByteToCharDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp939";
-    }
-
-    public ByteToCharCp939() {
-        super((DoubleByte.Decoder)new IBM939().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp942.java b/src/share/classes/sun/io/ByteToCharCp942.java
deleted file mode 100644
index 5970999..0000000
--- a/src/share/classes/sun/io/ByteToCharCp942.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp942 extends ByteToCharDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp942";
-    }
-
-    public ByteToCharCp942() {
-        super((DoubleByte.Decoder)new IBM942().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp942C.java b/src/share/classes/sun/io/ByteToCharCp942C.java
deleted file mode 100644
index 8b03dc4..0000000
--- a/src/share/classes/sun/io/ByteToCharCp942C.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp942C extends ByteToCharDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp942C";
-    }
-
-    public ByteToCharCp942C() {
-        super((DoubleByte.Decoder)new IBM942C().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp943.java b/src/share/classes/sun/io/ByteToCharCp943.java
deleted file mode 100644
index 798e696..0000000
--- a/src/share/classes/sun/io/ByteToCharCp943.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp943 extends ByteToCharDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp943";
-    }
-
-    public ByteToCharCp943() {
-        super((DoubleByte.Decoder)new IBM943().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp943C.java b/src/share/classes/sun/io/ByteToCharCp943C.java
deleted file mode 100644
index ea99f9f..0000000
--- a/src/share/classes/sun/io/ByteToCharCp943C.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp943C extends ByteToCharDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp943C";
-    }
-
-    public ByteToCharCp943C() {
-        super((DoubleByte.Decoder)new IBM943C().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp948.java b/src/share/classes/sun/io/ByteToCharCp948.java
deleted file mode 100644
index 0c68eda..0000000
--- a/src/share/classes/sun/io/ByteToCharCp948.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp948 extends ByteToCharDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp948";
-    }
-
-    public ByteToCharCp948() {
-        super((DoubleByte.Decoder)new IBM948().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp949.java b/src/share/classes/sun/io/ByteToCharCp949.java
deleted file mode 100644
index ab239a7..0000000
--- a/src/share/classes/sun/io/ByteToCharCp949.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp949 extends ByteToCharDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp949";
-    }
-
-    public ByteToCharCp949() {
-        super((DoubleByte.Decoder)new IBM949().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp949C.java b/src/share/classes/sun/io/ByteToCharCp949C.java
deleted file mode 100644
index 894bd3d..0000000
--- a/src/share/classes/sun/io/ByteToCharCp949C.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp949C extends ByteToCharDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp949C";
-    }
-
-    public ByteToCharCp949C() {
-        super((DoubleByte.Decoder)new IBM949C().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp950.java b/src/share/classes/sun/io/ByteToCharCp950.java
deleted file mode 100644
index fc5ca80..0000000
--- a/src/share/classes/sun/io/ByteToCharCp950.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp950 extends ByteToCharDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp950";
-    }
-
-    public ByteToCharCp950() {
-        super((DoubleByte.Decoder)new IBM950().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp964.java b/src/share/classes/sun/io/ByteToCharCp964.java
deleted file mode 100644
index 0bcef26..0000000
--- a/src/share/classes/sun/io/ByteToCharCp964.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.IBM964;
-
-/**
-* @author Malcolm Ayres
-*/
-public class ByteToCharCp964 extends ByteToCharConverter
-{
-    private final static IBM964 nioCoder = new IBM964();
-
-    private final int G0 = 0;
-    private final int G1 = 1;
-    private final int G2 = 2;
-    private final int G3 = 3;
-    private final int G4 = 4;
-    private final int SS2 =  0x8E;
-    private final int SS3 =  0x8F;
-
-    private int firstByte, state;
-
-    private String byteToCharTable;
-    private String mappingTableG1;
-    private String mappingTableG2;
-    private String mappingTableG2a2;
-    private String mappingTableG2ac;
-    private String mappingTableG2ad;
-
-
-    public ByteToCharCp964() {
-       super();
-       state = G0;
-       byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-       mappingTableG1 = nioCoder.getDecoderMappingTableG1();
-       mappingTableG2a2 = nioCoder.getDecoderMappingTableG2a2();
-       mappingTableG2ac = nioCoder.getDecoderMappingTableG2ac();
-       mappingTableG2ad = nioCoder.getDecoderMappingTableG2ad();
-    }
-
-    /**
-      * Return the character set id
-      */
-    public String getCharacterEncoding()
-    {
-       return "Cp964";
-    }
-
-    /**
-      * flush out any residual data and reset the buffer state
-      */
-    public int flush(char[] output, int outStart, int outEnd)
-       throws MalformedInputException
-    {
-       if (state != G0) {
-          reset();
-          badInputLength = 0;
-          throw new MalformedInputException();
-       }
-
-       reset();
-       return 0;
-    }
-
-    /**
-     *  Resets the converter.
-     */
-    public void reset() {
-       state = G0;
-       charOff = byteOff = 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-
-       int       byte1;
-       char      outputChar = '\uFFFD';
-
-       byteOff = inOff;
-       charOff = outOff;
-
-       while (byteOff < inEnd) {
-
-          byte1 = input[byteOff];
-          if (byte1 < 0)
-            byte1 += 256;
-
-          switch (state) {
-             case G0:
-                if (byte1 == SS2)
-                   state = G2;
-                else if (byte1 == SS3) {
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-                else if ( byte1 <= 0x9f )               // valid single byte
-                   outputChar = byteToCharTable.charAt(byte1);
-                else if (byte1 < 0xa1 || byte1 > 0xfe) {
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                } else {                                // valid 1st byte for G1
-                   firstByte = byte1;
-                   state = G1;
-                }
-                break;
-
-             case G1:
-                state = G0;
-                if ( byte1 < 0xa1 || byte1 > 0xfe) {   // valid second byte for G1
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-                outputChar = mappingTableG1.charAt(((firstByte - 0xa1) * 94)  + byte1 - 0xa1);
-                break;
-
-             case G2:
-                // set the correct mapping table for supported G2 sets
-                if ( byte1 == 0xa2)
-                  mappingTableG2 = mappingTableG2a2;
-                else
-                if ( byte1 == 0xac)
-                  mappingTableG2 = mappingTableG2ac;
-                else
-                if ( byte1 == 0xad)
-                  mappingTableG2 = mappingTableG2ad;
-                else {
-                   state = G0;
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-                state = G3;
-                break;
-
-             case G3:
-                if ( byte1 < 0xa1 || byte1 > 0xfe) {  // valid 1st byte for G2 set
-                   state = G0;
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-                firstByte = byte1;
-                state = G4;
-                break;
-
-             case G4:
-                state = G0;
-                if ( byte1 < 0xa1 || byte1 > 0xfe) { // valid 2nd byte for G2 set
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-                outputChar = mappingTableG2.charAt(((firstByte - 0xa1) * 94)  + byte1 - 0xa1);
-                break;
-
-          }
-
-          if (state == G0) {
-             if (outputChar == '\uFFFD') {
-                if (subMode)
-                   outputChar = subChars[0];
-                else {
-                   badInputLength = 1;
-                   throw new UnknownCharacterException();
-                }
-             }
-
-             if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-
-             output[charOff++] = outputChar;
-          }
-
-          byteOff++;
-
-       }
-
-       return charOff - outOff;
-
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharCp970.java b/src/share/classes/sun/io/ByteToCharCp970.java
deleted file mode 100644
index 03c272d..0000000
--- a/src/share/classes/sun/io/ByteToCharCp970.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharCp970 extends ByteToCharEUC2 {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp970";
-    }
-
-    public ByteToCharCp970() {
-        super((DoubleByte.Decoder)new IBM970().newDecoder());
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java b/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java
deleted file mode 100644
index ee93c03..0000000
--- a/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import static sun.nio.cs.CharsetMapping.*;
-
-public abstract class ByteToCharDBCS_ASCII extends ByteToCharConverter
-{
-    private boolean savedBytePresent;
-    private int savedByte;
-
-    private DoubleByte.Decoder dec;
-
-    public ByteToCharDBCS_ASCII(DoubleByte.Decoder dec) {
-        super();
-        savedBytePresent = false;
-        this.dec = dec;
-    }
-
-    char decodeSingle(int b) {
-        return dec.decodeSingle(b);
-    }
-
-    char decodeDouble(int b1, int b2) {
-        return dec.decodeDouble(b1, b2);
-    }
-
-    public int flush(char [] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-
-       if (savedBytePresent) {
-           reset();
-           badInputLength = 0;
-           throw new MalformedInputException();
-       }
-
-       reset();
-       return 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        int inputSize;
-        char    outputChar = UNMAPPABLE_DECODING;
-
-        charOff = outOff;
-        byteOff = inOff;
-
-        while(byteOff < inEnd)
-        {
-           int byte1;
-
-           if (!savedBytePresent) {
-              byte1 = input[byteOff] & 0xff;
-              inputSize = 1;
-           } else {
-              byte1 = savedByte;
-              savedBytePresent = false;
-              inputSize = 0;
-           }
-
-           outputChar = decodeSingle(byte1);
-           if (outputChar == UNMAPPABLE_DECODING) {
-
-              if (byteOff + inputSize >= inEnd) {
-                savedByte = byte1;
-                savedBytePresent = true;
-                byteOff += inputSize;
-                break;
-              }
-
-              outputChar = decodeDouble(byte1, input[byteOff+inputSize] & 0xff);
-              inputSize++;
-           }
-
-           if (outputChar == UNMAPPABLE_DECODING) {
-              if (subMode)
-                 outputChar = subChars[0];
-              else {
-                 badInputLength = inputSize;
-                 throw new UnknownCharacterException();
-              }
-           }
-
-           if (charOff >= outEnd)
-              throw new ConversionBufferFullException();
-
-           output[charOff++] = outputChar;
-           byteOff += inputSize;
-
-        }
-
-        return charOff - outOff;
-    }
-
-    /**
-     *  Resets the converter.
-     */
-    public void reset() {
-       charOff = byteOff = 0;
-       savedBytePresent = false;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharDBCS_EBCDIC.java b/src/share/classes/sun/io/ByteToCharDBCS_EBCDIC.java
deleted file mode 100644
index 37442f4..0000000
--- a/src/share/classes/sun/io/ByteToCharDBCS_EBCDIC.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import static sun.nio.cs.CharsetMapping.*;
-
-public abstract class ByteToCharDBCS_EBCDIC extends ByteToCharConverter
-{
-
-    private static final int SBCS = 0;
-    private static final int DBCS = 1;
-
-    private static final int SO = 0x0e;
-    private static final int SI = 0x0f;
-
-    private int  currentState;
-    private boolean savedBytePresent;
-    private int savedByte;
-
-    private DoubleByte.Decoder dec;
-
-    public ByteToCharDBCS_EBCDIC(DoubleByte.Decoder dec) {
-       super();
-       currentState = SBCS;
-       savedBytePresent = false;
-       this.dec = dec;
-    }
-
-    char decodeSingle(int b) {
-        return dec.decodeSingle(b);
-    }
-
-    char decodeDouble(int b1, int b2) {
-        return dec.decodeDouble(b1, b2);
-    }
-
-    public int flush(char [] output, int outStart, int outEnd)
-       throws MalformedInputException
-    {
-
-       if (savedBytePresent) {
-           reset();
-           badInputLength = 0;
-           throw new MalformedInputException();
-       }
-
-       reset();
-       return 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-       int  inputSize;
-       char outputChar = UNMAPPABLE_DECODING;
-
-       charOff = outOff;
-       byteOff = inOff;
-
-       while(byteOff < inEnd) {
-          int byte1, byte2;
-
-          if (!savedBytePresent) {
-            byte1 = input[byteOff] & 0xff;
-            inputSize = 1;
-          } else {
-            byte1 = savedByte;
-            savedBytePresent = false;
-            inputSize = 0;
-          }
-
-          if (byte1 == SO) {
-
-             // For SO characters - simply validate the state and if OK
-             //    update the state and go to the next byte
-
-             if (currentState != SBCS) {
-                badInputLength = 1;
-                throw new MalformedInputException();
-             } else {
-                currentState = DBCS;
-                byteOff += inputSize;
-             }
-          }
-
-          else
-             if (byte1 == SI) {
-                // For SI characters - simply validate the state and if OK
-                //    update the state and go to the next byte
-
-                if (currentState != DBCS) {
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                } else {
-                   currentState = SBCS;
-                   byteOff+= inputSize;
-                }
-             } else {
-
-                // Process the real data characters
-
-                if (currentState == SBCS) {
-                   outputChar = decodeSingle(byte1);
-                } else {
-
-                   // for a DBCS character - architecture dictates the
-                   // valid range of 1st bytes
-
-                   if (byte1 < 0x40 || byte1 > 0xfe) {
-                      badInputLength = 1;
-                      throw new MalformedInputException();
-                   }
-
-                   if (byteOff + inputSize >= inEnd) {
-                      // We have been split in the middle if a character
-                      // save the first byte for next time around
-
-                      savedByte = byte1;
-                      savedBytePresent = true;
-                      byteOff += inputSize;
-                      break;
-                   }
-
-                   byte2 = input[byteOff+inputSize] & 0xff;
-                   inputSize++;
-
-                   // validate the pair of bytes meet the architecture
-
-                   if ((byte1 != 0x40 || byte2 != 0x40) &&
-                      (byte2 < 0x41 || byte2 > 0xfe)) {
-                      badInputLength = 2;
-                      throw new MalformedInputException();
-                   }
-
-                   outputChar = decodeDouble(byte1, byte2);
-                }
-
-                if (outputChar == UNMAPPABLE_DECODING) {
-                   if (subMode)
-                      outputChar = subChars[0];
-                   else {
-                      badInputLength = inputSize;
-                      throw new UnknownCharacterException();
-                   }
-                }
-
-                if (charOff >= outEnd)
-                   throw new ConversionBufferFullException();
-
-                output[charOff++] = outputChar;
-                byteOff += inputSize;
-             }
-
-       }
-
-       return charOff - outOff;
-    }
-
-
-    /**
-     *  Resets the converter.
-     */
-    public void reset() {
-       charOff = byteOff = 0;
-       currentState = SBCS;
-       savedBytePresent = false;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharDoubleByte.java b/src/share/classes/sun/io/ByteToCharDoubleByte.java
deleted file mode 100644
index 7e78e3b..0000000
--- a/src/share/classes/sun/io/ByteToCharDoubleByte.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * @author Limin Shi
- *         Sean Jiang
- */
-
-public abstract class ByteToCharDoubleByte extends ByteToCharConverter {
-    protected byte savedByte;
-
-    /*
-     * 1st level index, provided by subclass
-     */
-    protected short index1[];
-
-    /*
-     * 2nd level index, provided by subclass
-     * every string has 0x10*(end-start+1) characters.
-     */
-    protected String  index2[];
-
-    protected int start;
-    protected int end;
-
-    /*
-     * Size of bad input that caused conversion to stop
-     */
-    protected int     badInputLength;
-
-    public ByteToCharDoubleByte() {
-        super();
-        savedByte = 0;
-    }
-
-
-    public short[] getIndex1() {
-        return(index1);
-    }
-
-    public String[] getIndex2() {
-        return(index2);
-    }
-
-    public int flush(char[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (savedByte != 0) {
-            reset();
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        reset();
-        return 0;
-    }
-
-    /**
-     * Converts sequences of bytes to characters.
-     * Conversions that result in Exceptions can be restarted by calling
-     * convert again, with appropriately modified parameters.
-     * @return the characters written to output.
-     * @param input byte array containing text in Double/single Byte
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output character array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last byte to be written to
-     * @throw UnsupportedCharacterException for any bytes
-     * that cannot be converted to the external character set.
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        char    outputChar = REPLACE_CHAR;
-        int     inputSize = 0;          // Size of input
-
-        // Record beginning offsets
-        charOff = outOff;
-        byteOff = inOff;
-
-        // Loop until we hit the end of the input
-        while (byteOff < inEnd) {
-            int byte1, byte2;
-
-            if (savedByte == 0) {
-                byte1 = input[byteOff];
-                inputSize = 1;
-            } else {
-                byte1 = savedByte;
-                savedByte = 0;
-                inputSize = 0;
-            }
-
-            outputChar = convSingleByte(byte1);
-
-            if (outputChar == REPLACE_CHAR) {   // DoubleByte char
-                if (byteOff + inputSize >= inEnd) {
-                    // split in the middle of a character
-                    // save the first byte for next time around
-                    savedByte = (byte) byte1;
-                    byteOff += inputSize;
-                    break;
-                }
-
-                byte1 &= 0xff;
-                byte2 = input[byteOff + inputSize] & 0xff;
-
-                inputSize++;
-                outputChar = getUnicode(byte1, byte2);
-            }
-
-            if (outputChar == REPLACE_CHAR) {
-                if (subMode)
-                    outputChar = subChars[0];
-                else {
-                    badInputLength = inputSize;
-                    throw new UnknownCharacterException();
-                }
-            }
-
-            if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-
-            output[charOff++] = outputChar;
-            byteOff += inputSize;
-        }
-
-        return charOff - outOff;
-    }
-
-    /**
-     * Resets the converter.
-     * Call this method to reset the converter to its initial state
-     */
-    public void reset() {
-        byteOff = charOff = 0;
-        savedByte = 0;
-    }
-
-
-    /*
-     * Can be changed by subclass
-     */
-    protected char convSingleByte(int b) {
-        if (b >= 0)
-            return (char) b;
-        return REPLACE_CHAR;
-    }
-
-    /*
-     * Can be changed by subclass
-     */
-    protected char getUnicode(int byte1, int byte2) {
-        // Fix for bug 4117820 - similar fix for bug 4121358 put
-        // into ByteToCharEUC_JP.getUnicode()
-        if (((byte1 < 0) || (byte1 > index1.length))
-            || ((byte2 < start) || (byte2 > end)))
-            return REPLACE_CHAR;
-
-        int n = (index1[byte1] & 0xf) * (end - start + 1) + (byte2 - start);
-        return index2[index1[byte1] >> 4].charAt(n);
-    }
-
-    protected final static char REPLACE_CHAR = '\uFFFD';
-}
diff --git a/src/share/classes/sun/io/ByteToCharEUC.java b/src/share/classes/sun/io/ByteToCharEUC.java
deleted file mode 100644
index 94a9801..0000000
--- a/src/share/classes/sun/io/ByteToCharEUC.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-/**
-* @author Malcolm Ayres
-*/
-public abstract class ByteToCharEUC extends ByteToCharConverter
-{
-    private final int G0 = 0;
-    private final int G1 = 1;
-    private final int SS2 =  0x8E;
-    private final int SS3 =  0x8F;
-
-    private int firstByte, state;
-
-    protected String  mappingTableG1;
-    protected String  byteToCharTable;
-
-
-    public ByteToCharEUC() {
-        super();
-        state = G0;
-    }
-
-    /**
-      * flush out any residual data and reset the buffer state
-      */
-    public int flush(char[] output, int outStart, int outEnd)
-       throws MalformedInputException
-    {
-       if (state != G0) {
-          reset();
-          badInputLength = 0;
-          throw new MalformedInputException();
-       }
-
-       reset();
-       return 0;
-    }
-
-    /**
-     *  Resets the converter.
-     */
-    public void reset() {
-       state = G0;
-       charOff = byteOff = 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-
-       int       byte1;
-       char      outputChar = '\uFFFD';
-
-       byteOff = inOff;
-       charOff = outOff;
-
-       while (byteOff < inEnd) {
-
-          byte1 = input[byteOff];
-          if (byte1 < 0)
-             byte1 += 256;
-
-          switch (state) {
-             case G0:
-                if (byte1 == SS2 ||                // no general support
-                    byte1 == SS3 ) {               //    for g2 or g3
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-
-                if ( byte1 <= 0x9f )               // < 0x9f has its own table
-                   outputChar = byteToCharTable.charAt(byte1);
-                else
-                   if (byte1 < 0xa1 || byte1 > 0xfe) {  // byte within range?
-                      badInputLength = 1;
-                      throw new MalformedInputException();
-                   } else {                       // G1 set first byte
-                      firstByte = byte1;
-                      state = G1;
-                   }
-                break;
-
-             case G1:
-
-                state = G0;
-                if ( byte1 < 0xa1 || byte1 > 0xfe) {  // valid G1 set second byte
-                   badInputLength = 1;
-                   throw new MalformedInputException();
-                }
-
-                outputChar = mappingTableG1.charAt(((firstByte - 0xa1) * 94) + byte1 - 0xa1);
-                break;
-
-          }
-
-          if (state == G0) {
-             if (outputChar == '\uFFFD') {
-                if (subMode)
-                   outputChar = subChars[0];
-                else {
-                   badInputLength = 1;
-                   throw new UnknownCharacterException();
-                }
-             }
-
-             if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-
-             output[charOff++] = outputChar;
-          }
-
-          byteOff++;
-
-       }
-
-       return charOff - outOff;
-
-   }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharEUC2.java b/src/share/classes/sun/io/ByteToCharEUC2.java
deleted file mode 100644
index e5d50ce..0000000
--- a/src/share/classes/sun/io/ByteToCharEUC2.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import static sun.nio.cs.CharsetMapping.*;
-
-public abstract class ByteToCharEUC2 extends ByteToCharConverter
-{
-    private final int G0 = 0;
-    private final int G1 = 1;
-    private final int SS2 =  0x8E;
-    private final int SS3 =  0x8F;
-
-    private int firstByte, state;
-
-    private DoubleByte.Decoder dec;
-
-    public ByteToCharEUC2(DoubleByte.Decoder dec) {
-        super();
-        state = G0;
-        this.dec = dec;
-    }
-
-    char decodeSingle(int b) {
-        return dec.decodeSingle(b);
-    }
-
-    char decodeDouble(int b1, int b2) {
-        return dec.decodeDouble(b1, b2);
-    }
-
-    /**
-      * flush out any residual data and reset the buffer state
-      */
-    public int flush(char[] output, int outStart, int outEnd)
-       throws MalformedInputException
-    {
-       if (state != G0) {
-          reset();
-          badInputLength = 0;
-          throw new MalformedInputException();
-       }
-
-       reset();
-       return 0;
-    }
-
-    /**
-     *  Resets the converter.
-     */
-    public void reset() {
-       state = G0;
-       charOff = byteOff = 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        int       byte1;
-        char      outputChar = UNMAPPABLE_DECODING;
-        byteOff = inOff;
-        charOff = outOff;
-
-        while (byteOff < inEnd) {
-            byte1 = input[byteOff] & 0xff;
-            switch (state) {
-            case G0:
-                if (byte1 == SS2 ||                // no general support
-                    byte1 == SS3 ) {               //    for g2 or g3
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-                if ( byte1 <= 0x9f )               // < 0x9f has its own table
-                    outputChar = decodeSingle(byte1);
-                else
-                    if (byte1 < 0xa1 || byte1 > 0xfe) {  // byte within range?
-                        badInputLength = 1;
-                        throw new MalformedInputException();
-                    } else {                       // G1 set first byte
-                        firstByte = byte1;
-                        state = G1;
-                    }
-                break;
-            case G1:
-                state = G0;
-                if ( byte1 < 0xa1 || byte1 > 0xfe) {  // valid G1 set second byte
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-                outputChar = decodeDouble(firstByte, byte1);
-                break;
-            }
-            if (state == G0) {
-                if (outputChar == UNMAPPABLE_DECODING) {
-                    if (subMode)
-                        outputChar = subChars[0];
-                    else {
-                        badInputLength = 1;
-                        throw new UnknownCharacterException();
-                    }
-                }
-                if (charOff >= outEnd)
-                    throw new ConversionBufferFullException();
-                output[charOff++] = outputChar;
-            }
-            byteOff++;
-         }
-         return charOff - outOff;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharEUC_CN.java b/src/share/classes/sun/io/ByteToCharEUC_CN.java
deleted file mode 100644
index b30f3c7..0000000
--- a/src/share/classes/sun/io/ByteToCharEUC_CN.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharEUC_CN extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new EUC_CN().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "EUC_CN";
-    }
-
-    public ByteToCharEUC_CN() {
-        super(dec);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharEUC_JP.java b/src/share/classes/sun/io/ByteToCharEUC_JP.java
deleted file mode 100644
index bcf0c70..0000000
--- a/src/share/classes/sun/io/ByteToCharEUC_JP.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * @author Limin Shi
- */
-
-public class ByteToCharEUC_JP extends ByteToCharJIS0208 {
-    private byte savedSecond = 0;
-
-    ByteToCharJIS0201 bcJIS0201 = new ByteToCharJIS0201();
-    ByteToCharJIS0212 bcJIS0212 = new ByteToCharJIS0212();
-
-    public ByteToCharEUC_JP() {
-        super();
-        start = 0xA1;
-        end = 0xFE;
-        savedSecond = 0;
-    }
-
-    public int flush(char[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (savedSecond != 0) {
-            reset();
-            throw new MalformedInputException();
-        }
-        reset();
-        return 0;
-    }
-
-    /**
-     * Resets the converter.
-     * Call this method to reset the converter to its initial state
-     */
-    public void reset() {
-        super.reset();
-        savedSecond = 0;
-    }
-
-    public String getCharacterEncoding() {
-        return "EUC_JP";
-    }
-
-    protected char convSingleByte(int b) {
-        if (b < 0 || b > 0x7F)
-            return REPLACE_CHAR;
-        return bcJIS0201.getUnicode(b);
-    }
-
-    protected char getUnicode(int byte1, int byte2) {
-        if (byte1 == 0x8E) {
-            return bcJIS0201.getUnicode(byte2 - 256);
-        }
-        // Fix for bug 4121358 - similar fix for bug 4117820 put
-        // into ByteToCharDoubleByte.getUnicode()
-        if (((byte1 < 0) || (byte1 > index1.length))
-            || ((byte2 < start) || (byte2 > end)))
-            return REPLACE_CHAR;
-
-        int n = (index1[byte1 - 0x80] & 0xf) * (end - start + 1)
-                + (byte2 - start);
-        return index2[index1[byte1 - 0x80] >> 4].charAt(n);
-    }
-
-    protected char decode0212(int byte1, int byte2) {
-        return bcJIS0212.getUnicode(byte1, byte2);
-    }
-
-    /**
-     * Converts sequences of bytes to characters.
-     * Conversions that result in Exceptions can be restarted by calling
-     * convert again, with appropriately modified parameters.
-     * @return the characters written to output.
-     * @param input byte array containing text in Double/single Byte
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output character array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last byte to be written to
-     * @throw UnsupportedCharacterException for any bytes
-     * that cannot be converted to the external character set.
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException,
-               ConversionBufferFullException
-    {
-        char    outputChar = REPLACE_CHAR;
-        int     inputSize = 0;          // Size of input
-
-        // Record beginning offsets
-        charOff = outOff;
-        byteOff = inOff;
-
-        // Loop until we hit the end of the input
-        while (byteOff < inEnd) {
-            int byte1, byte2;
-
-            if (savedByte == 0) {
-                byte1 = input[byteOff];
-                inputSize = 1;
-            } else {
-                byte1 = savedByte;
-                savedByte = 0;
-                inputSize = 0;
-            }
-
-            outputChar = convSingleByte(byte1);
-
-            if (outputChar == REPLACE_CHAR) {   // Multibyte char
-                if ((byte1 & 0xff) == 0x8F) {   // JIS0212
-                    if (byteOff + inputSize + 1 >= inEnd) {
-                        // split in the middle of a character
-                        // save the first 2 bytes for next time around
-                        savedByte = (byte) byte1;
-                        byteOff += inputSize;
-                        if (byteOff < inEnd) {
-                            savedSecond = input[byteOff];
-                            byteOff++;
-                        }
-                        break;
-                    }
-                    if (savedSecond != 0) {
-                        byte1 = savedSecond & 0xff;
-                        savedSecond = 0;
-                    } else {
-                        byte1 = input[byteOff + inputSize] & 0xff;
-                        inputSize++;
-                    }
-                    byte2 = input[byteOff + inputSize] & 0xff;
-                    inputSize++;
-                    outputChar = decode0212(byte1-0x80, byte2-0x80);
-                } else { // JIS0208
-                    if (byteOff + inputSize >= inEnd) {
-                        // split in the middle of a character
-                        // save the first byte for next time around
-                        savedByte = (byte) byte1;
-                        byteOff += inputSize;
-                        break;
-                    }
-                    byte1 &= 0xff;
-                    byte2 = input[byteOff + inputSize] & 0xff;
-                    inputSize++;
-                    outputChar = getUnicode(byte1, byte2);
-                }
-            }
-
-            if (outputChar == REPLACE_CHAR) {
-                if (subMode)
-                    outputChar = subChars[0];
-                else {
-                    badInputLength = inputSize;
-                    throw new UnknownCharacterException();
-                }
-            }
-
-            if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-
-            output[charOff++] = outputChar;
-            byteOff += inputSize;
-        }
-
-        return charOff - outOff;
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharEUC_JP_LINUX.java b/src/share/classes/sun/io/ByteToCharEUC_JP_LINUX.java
deleted file mode 100644
index 5cf0b20..0000000
--- a/src/share/classes/sun/io/ByteToCharEUC_JP_LINUX.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * Class for converting bytes to characters for the EUC-JP encoding in
- * linux. This converter supports the JIS0201 and the JIS0208 encoding and
- * omits support for the JIS212 encoding.
- *
- * @author Naveen Sanjeeva
- */
-
-public class ByteToCharEUC_JP_LINUX extends  ByteToCharJIS0208 {
-    private byte savedSecond = 0;
-    ByteToCharJIS0201 bcJIS0201 = new ByteToCharJIS0201();
-
-    public ByteToCharEUC_JP_LINUX() {
-        super();
-        start = 0xA1;
-        end = 0xFE;
-        savedSecond = 0;
-    }
-
-    public int flush(char[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (savedSecond != 0) {
-            reset();
-            throw new MalformedInputException();
-        }
-        reset();
-        return 0;
-    }
-
-    /**
-     * Resets the converter.
-     * Call this method to reset the converter to its initial state
-     */
-    public void reset() {
-        super.reset();
-        savedSecond = 0;
-    }
-
-    public String getCharacterEncoding() {
-        return "EUC_JP_LINUX";
-    }
-
-    protected char convSingleByte(int b) {
-        if (b < 0 || b > 0x7F)
-            return REPLACE_CHAR;
-        return bcJIS0201.getUnicode(b);
-    }
-
-    protected char getUnicode(int byte1, int byte2) {
-        if (byte1 == 0x8E) {
-            return bcJIS0201.getUnicode(byte2 - 256);
-        }
-        // Fix for bug 4121358 - similar fix for bug 4117820 put
-        // into ByteToCharDoubleByte.getUnicode()
-        if (((byte1 < 0) || (byte1 > index1.length))
-            || ((byte2 < start) || (byte2 > end)))
-            return REPLACE_CHAR;
-
-        int n = (index1[byte1 - 0x80] & 0xf) * (end - start + 1)
-                + (byte2 - start);
-        return index2[index1[byte1 - 0x80] >> 4].charAt(n);
-    }
-
-    /**
-     * Converts sequences of bytes to characters.
-     * Conversions that result in Exceptions can be restarted by calling
-     * convert again, with appropriately modified parameters.
-     * @return the characters written to output.
-     * @param input byte array containing text in Double/single Byte
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output character array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last byte to be written to
-     * @throw UnsupportedCharacterException for any bytes
-     * that cannot be converted to the external character set.
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException,
-               ConversionBufferFullException
-    {
-        char    outputChar = REPLACE_CHAR;
-        int     inputSize = 0;          // Size of input
-
-        // Record beginning offsets
-        charOff = outOff;
-        byteOff = inOff;
-
-        // Loop until we hit the end of the input
-        while (byteOff < inEnd) {
-            int byte1, byte2;
-
-            if (savedByte == 0) {
-                byte1 = input[byteOff];
-                inputSize = 1;
-            } else {
-                byte1 = savedByte;
-                savedByte = 0;
-                inputSize = 0;
-            }
-
-            outputChar = convSingleByte(byte1);
-
-            if (outputChar == REPLACE_CHAR) {   // Multibyte char
-                if ((byte1 & 0xff) != 0x8F) {   // JIS0208
-                    if (byteOff + inputSize >= inEnd) {
-                        // split in the middle of a character
-                        // save the first byte for next time around
-                        savedByte = (byte) byte1;
-                        byteOff += inputSize;
-                        break;
-                    }
-                    byte1 &= 0xff;
-                    byte2 = input[byteOff + inputSize] & 0xff;
-                    inputSize++;
-                    outputChar = getUnicode(byte1, byte2);
-                } else if ((byte1 & 0xff) == 0x8F) {   // JIS0212
-                    // Handling of 3-byte sequences for this converter involves
-                    // just ignoring the relevant bytes and returning a
-                    // suitable substitute char if one exists.
-                    if (byteOff + inputSize + 1 >= inEnd) {
-                        // split in the middle of a character
-                        // save the first 2 bytes for next time around
-                        savedByte = (byte) byte1;
-                        byteOff += inputSize;
-                        if (byteOff < inEnd) {
-                            savedSecond = input[byteOff];
-                            byteOff++;
-                        }
-                        break;
-                    }
-
-                    // Skip over the saved bytes if any
-                    if (savedSecond != 0) {
-                        savedSecond = 0;
-                    } else {
-                        inputSize++;
-                    }
-                    inputSize++;
-                }
-            }
-
-            if (outputChar == REPLACE_CHAR) {
-                if (subMode)
-                    outputChar = subChars[0];
-                else {
-                    badInputLength = inputSize;
-                    throw new UnknownCharacterException();
-                }
-            }
-
-            if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-
-            output[charOff++] = outputChar;
-            byteOff += inputSize;
-        }
-
-        return charOff - outOff;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharEUC_JP_Solaris.java b/src/share/classes/sun/io/ByteToCharEUC_JP_Solaris.java
deleted file mode 100644
index 3353a74..0000000
--- a/src/share/classes/sun/io/ByteToCharEUC_JP_Solaris.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0208_Solaris_Decoder;
-import sun.nio.cs.ext.JIS_X_0212_Solaris_Decoder;
-/**
- *
- * @author Limin Shi
- * @author Ian Little
- *
- * EUC_JP variant converter for Solaris with vendor defined chars
- * added (4765370)
- */
-
-
-public class ByteToCharEUC_JP_Solaris extends ByteToCharEUC_JP {
-    private byte savedSecond = 0;
-
-    ByteToCharJIS0201 bcJIS0201 = new ByteToCharJIS0201();
-    ByteToCharJIS0212_Solaris bcJIS0212 = new ByteToCharJIS0212_Solaris();
-
-    short[] j0208Index1 = JIS_X_0208_Solaris_Decoder.getIndex1();
-    String[] j0208Index2 = JIS_X_0208_Solaris_Decoder.getIndex2();
-    ByteToCharJIS0212_Solaris j0212Decoder = new ByteToCharJIS0212_Solaris();
-
-    public ByteToCharEUC_JP_Solaris() {
-        super();
-        start = 0xA1;
-        end = 0xFE;
-        savedSecond = 0;
-    }
-
-    public int flush(char[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (savedSecond != 0) {
-            reset();
-            throw new MalformedInputException();
-        }
-        reset();
-        return 0;
-    }
-
-    /**
-     * Resets the converter.
-     * Call this method to reset the converter to its initial state
-     */
-    public void reset() {
-        super.reset();
-        savedSecond = 0;
-    }
-
-    public String getCharacterEncoding() {
-        return "eucJP-open";
-    }
-
-    protected char convSingleByte(int b) {
-        if (b < 0 || b > 0x7F)
-            return REPLACE_CHAR;
-        return bcJIS0201.getUnicode(b);
-    }
-
-    protected char getUnicode(int byte1, int byte2) {
-        if (byte1 == 0x8E) {
-            return bcJIS0201.getUnicode(byte2 - 256);
-        }
-        // Fix for bug 4121358 - similar fix for bug 4117820 put
-        // into ByteToCharDoubleByte.getUnicode()
-        if (((byte1 < 0) || (byte1 > j0208Index1.length))
-            || ((byte2 < start) || (byte2 > end)))
-            return REPLACE_CHAR;
-
-        char result = super.getUnicode(byte1, byte2);
-        if (result != '\uFFFD') {
-            return result;
-        } else {
-            int n = (j0208Index1[byte1 - 0x80] & 0xf) * (end - start + 1)
-                + (byte2 - start);
-        return j0208Index2[j0208Index1[byte1 - 0x80] >> 4].charAt(n);
-        }
-    }
-
-    protected char decode0212(int byte1, int byte2) {
-        return j0212Decoder.getUnicode(byte1, byte2);
-    }
-
-    /**
-     * Converts sequences of bytes to characters.
-     * Conversions that result in Exceptions can be restarted by calling
-     * convert again, with appropriately modified parameters.
-     * @return the characters written to output.
-     * @param input byte array containing text in Double/single Byte
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output character array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last byte to be written to
-     * @throw UnsupportedCharacterException for any bytes
-     * that cannot be converted to the external character set.
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException,
-               ConversionBufferFullException
-    {
-        char    outputChar = REPLACE_CHAR;
-        int     inputSize = 0;          // Size of input
-
-        // Record beginning offsets
-        charOff = outOff;
-        byteOff = inOff;
-
-        // Loop until we hit the end of the input
-        while (byteOff < inEnd) {
-            int byte1, byte2;
-
-            if (savedByte == 0) {
-                byte1 = input[byteOff];
-                inputSize = 1;
-            } else {
-                byte1 = savedByte;
-                savedByte = 0;
-                inputSize = 0;
-            }
-
-            outputChar = convSingleByte(byte1);
-
-            if (outputChar == REPLACE_CHAR) {   // Multibyte char
-                if ((byte1 & 0xff) == 0x8F) {   // JIS0212
-                    if (byteOff + inputSize + 1 >= inEnd) {
-                        // split in the middle of a character
-                        // save the first 2 bytes for next time around
-                        savedByte = (byte) byte1;
-                        byteOff += inputSize;
-                        if (byteOff < inEnd) {
-                            savedSecond = input[byteOff];
-                            byteOff++;
-                        }
-                        break;
-                    }
-                    if (savedSecond != 0) {
-                        byte1 = savedSecond & 0xff;
-                        savedSecond = 0;
-                    } else {
-                        byte1 = input[byteOff + inputSize] & 0xff;
-                        inputSize++;
-                    }
-                    byte2 = input[byteOff + inputSize] & 0xff;
-                    inputSize++;
-                    outputChar = bcJIS0212.getUnicode(byte1-0x80, byte2-0x80);
-                } else { // JIS0208
-                    if (byteOff + inputSize >= inEnd) {
-                        // split in the middle of a character
-                        // save the first byte for next time around
-                        savedByte = (byte) byte1;
-                        byteOff += inputSize;
-                        break;
-                    }
-                    byte1 &= 0xff;
-                    byte2 = input[byteOff + inputSize] & 0xff;
-                    inputSize++;
-                    outputChar = getUnicode(byte1, byte2);
-                }
-            }
-
-            if (outputChar == REPLACE_CHAR) {
-                if (subMode)
-                    outputChar = subChars[0];
-                else {
-                    badInputLength = inputSize;
-                    throw new UnknownCharacterException();
-                }
-            }
-
-            if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-
-            output[charOff++] = outputChar;
-            byteOff += inputSize;
-        }
-
-        return charOff - outOff;
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharEUC_KR.java b/src/share/classes/sun/io/ByteToCharEUC_KR.java
deleted file mode 100644
index 5b1901a..0000000
--- a/src/share/classes/sun/io/ByteToCharEUC_KR.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharEUC_KR extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new EUC_KR().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "EUC_KR";
-    }
-
-    public ByteToCharEUC_KR() {
-        super(dec);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharEUC_TW.java b/src/share/classes/sun/io/ByteToCharEUC_TW.java
deleted file mode 100644
index 97493c3..0000000
--- a/src/share/classes/sun/io/ByteToCharEUC_TW.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.EUC_TW;
-
-/*
- * @author Limin Shi
- */
-public class ByteToCharEUC_TW extends ByteToCharConverter
-{
-    private final byte G0 = 0;
-    private final byte G1 = 1;
-    private final byte G2 = 2;
-    private final byte G3 = 3;
-    private final byte G4 = 4;
-    private final byte MSB = (byte) 0x80;
-    private final byte SS2 = (byte) 0x8E;
-
-    private byte firstByte = 0, state = G0;
-    private int cnsPlane = 0;
-
-    private EUC_TW.Decoder dec = (EUC_TW.Decoder)(new EUC_TW().newDecoder());
-
-    public ByteToCharEUC_TW() {
-    }
-
-    public int flush(char[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (state != G0) {
-            state = G0;
-            firstByte = 0;
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        reset();
-        return 0;
-    }
-
-    public void reset() {
-        dec.reset();
-        state = G0;
-        firstByte = 0;
-        byteOff = charOff = 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        int inputSize = 0;
-        char[] c1 = new char[1];
-
-        byteOff = inOff;
-        charOff = outOff;
-
-        cnsPlane = 3;
-        while (byteOff < inEnd) {
-            if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-            char[] outputChar = null;
-            switch (state) {
-            case G0:
-                if ( (input[byteOff] & MSB) == 0) {     // ASCII
-                    outputChar = c1;
-                    outputChar[0] = (char) input[byteOff];
-                } else if (input[byteOff] == SS2) {     // Codeset 2
-                    state = G2;
-                } else {                                // Codeset 1
-                    firstByte = input[byteOff];
-                    state = G1;
-                }
-                break;
-            case G1:
-                inputSize = 2;
-                if ( (input[byteOff] & MSB) != 0) {     // 2nd byte
-                    cnsPlane = 0;
-                    outputChar = dec.toUnicode(firstByte & 0xff,
-                                               input[byteOff] & 0xff,
-                                               cnsPlane);
-                } else {                                // Error
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-                firstByte = 0;
-                state = G0;
-                break;
-            case G2:
-                cnsPlane = (input[byteOff] & (byte)0x0f);
-                // Adjust String array index for plan 15
-                cnsPlane = (cnsPlane == 15)? 8 : cnsPlane;
-
-                if (cnsPlane < 15) {
-                     state = G3;
-                } else {
-                    badInputLength = 2;
-                    throw new MalformedInputException();
-                }
-
-                break;
-            case G3:
-                if ( (input[byteOff] & MSB) != 0) {     // 1st byte
-                    firstByte = input[byteOff];
-                    state = G4;
-                } else {                                // Error
-                    state = G0;
-                    badInputLength = 2;
-                    throw new MalformedInputException();
-                }
-                break;
-            case G4:
-                if ( (input[byteOff] & MSB) != 0) {     // 2nd byte
-                    outputChar = dec.toUnicode(firstByte & 0xff,
-                                               input[byteOff] & 0xff,
-                                               cnsPlane - 1);
-                } else {                                // Error
-                    badInputLength = 3;
-                    throw new MalformedInputException();
-                }
-                firstByte = 0;
-                state = G0;
-                break;
-            }
-            byteOff++;
-            if (state == G0) {
-                if (outputChar == null) {
-                    if (subMode) {               // substitution enabled
-                        outputChar = c1;
-                        outputChar[0] = subChars[0];
-                    } else {
-                        badInputLength = inputSize;
-                        throw new UnknownCharacterException();
-                    }
-                }
-                output[charOff++] = outputChar[0];
-            }
-        }
-        return charOff - outOff;
-    }
-
-
-    /**
-     * Return the character set ID
-     */
-    public String getCharacterEncoding() {
-        return "EUC_TW";
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharGB18030.java b/src/share/classes/sun/io/ByteToCharGB18030.java
deleted file mode 100644
index 52b1f76..0000000
--- a/src/share/classes/sun/io/ByteToCharGB18030.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.GB18030;
-
-public class ByteToCharGB18030 extends ByteToCharGB18030DB {
-
-    private static final int GB18030_SINGLE_BYTE = 1;
-    private static final int GB18030_DOUBLE_BYTE = 2;
-    private static final int GB18030_FOUR_BYTE = 3;
-    private static short[] decoderIndex1;
-    private static String[] decoderIndex2;
-
-    private int currentState;
-    private int savedSize;
-    private byte[] savedBytes;
-
-    public ByteToCharGB18030() {
-        super();
-        GB18030 nioCoder = new GB18030();
-        savedBytes = new byte[3];
-        currentState = GB18030_DOUBLE_BYTE;
-        decoderIndex1 = nioCoder.getDecoderIndex1();
-        decoderIndex2 = nioCoder.getDecoderIndex2();
-        savedSize = 0;
-    }
-
-    public short[] getOuter() {
-        return(index1);
-    }
-
-    public String[] getInner() {
-        return(index2);
-    }
-
-    public short[] getDBIndex1() {
-        return(super.index1);
-    }
-
-    public String[] getDBIndex2() {
-        return(super.index2);
-    }
-
-    public int flush(char [] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (savedSize != 0) {
-            savedSize = 0;
-            currentState = GB18030_DOUBLE_BYTE;
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        int inputSize = 0;
-        char outputChar = '\uFFFD';
-        // readOff keeps the actual buffer's pointer.
-        // byteOff keeps original buffer's pointer.
-        int readOff = byteOff = inOff;
-
-        if (savedSize != 0) {
-            // Filter illegal bytes when they are detected in saved
-            // partial input from a previous conversion attempt.
-            if (((savedBytes[0] & 0xFF) < 0x81 || savedBytes[0] > 0xFE) ||
-                 (savedSize > 1 &&
-                 (savedBytes[1] & 0xFF) < 0x30 ) ||
-                 (savedSize > 2 &&
-                 ((savedBytes[2] & 0xFF) < 0x81 ||
-                 (savedBytes[2] & 0xFF) > 0xFE ))) {
-                    badInputLength = 0;
-                    throw new MalformedInputException();
-            }
-
-            byte[] newBuf = new byte[inEnd - inOff + savedSize];
-            for (int i = 0; i < savedSize; i++) {
-                newBuf[i] = savedBytes[i];
-            }
-            System.arraycopy(input, inOff, newBuf, savedSize, inEnd - inOff);
-            byteOff -= savedSize;
-            input = newBuf;
-            inOff = 0;
-            inEnd = newBuf.length;
-            savedSize = 0;
-        }
-
-        charOff = outOff;
-        readOff = inOff;
-
-        while(readOff < inEnd) {
-            int byte1 = 0 , byte2 = 0, byte3 = 0, byte4 = 0;
-
-            // Is there room in the output buffer for the result?
-            if (charOff >= outEnd) {
-                throw new ConversionBufferFullException();
-            }
-
-            // Get the input byte
-            byte1 = input[readOff++] & 0xFF;
-            inputSize = 1;
-
-            if ((byte1 & (byte)0x80) == 0){ // US-ASCII range
-                outputChar = (char)byte1;
-                currentState = GB18030_SINGLE_BYTE;
-            }
-
-            else if (byte1 < 0x81 || byte1 > 0xfe) {
-                if (subMode)
-                    outputChar = subChars[0];
-                else {
-                    badInputLength = 1;
-                    throw new UnknownCharacterException();
-                }
-            }
-            else {
-                // Either 2 or 4 byte sequence follows
-                // If an underrun is detected save for later
-                // replay.
-
-                if (readOff + inputSize > inEnd) {
-                    savedBytes[0]=(byte)byte1;
-                    savedSize = 1;
-                    break;
-                }
-
-                byte2 = input[readOff++] & 0xFF;
-                inputSize = 2;
-
-                if (byte2 < 0x30) {
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-                else if (byte2 >= 0x30 && byte2 <= 0x39) {
-                    currentState = GB18030_FOUR_BYTE;
-                    inputSize = 4;
-
-                    if (readOff + 2 > inEnd) {
-                        if (readOff + 1 > inEnd) {
-                            savedBytes[0] = (byte)byte1;
-                            savedBytes[1] = (byte)byte2;
-                            savedSize = 2;
-                        }
-                        else {
-                            savedBytes[0] = (byte)byte1;
-                            savedBytes[1] = (byte)byte2;
-                            savedBytes[2] = input[readOff++];
-                            savedSize = 3;
-                        }
-                        break;
-                    }
-                    byte3 = input[readOff++] & 0xFF;
-                    if (byte3 < 0x81 || byte3 > 0xfe) {
-                        badInputLength = 3;
-                        throw new MalformedInputException();
-                    }
-
-                    byte4 = input[readOff++] & 0xFF;
-
-                    if (byte4 < 0x30 || byte4 > 0x39) {
-                        badInputLength = 4;
-                        throw new MalformedInputException();
-                    }
-                }
-                else if (byte2 == 0x7f || byte2 == 0xff ||
-                        (byte2 < 0x40 )) {
-                   badInputLength = 2;
-                   throw new MalformedInputException();
-                }
-                else
-                    currentState = GB18030_DOUBLE_BYTE;
-            }
-
-            switch (currentState){
-                case GB18030_SINGLE_BYTE:
-                    output[charOff++] = (char)(byte1);
-                    break;
-                case GB18030_DOUBLE_BYTE:
-                    output[charOff++] = super.getUnicode(byte1, byte2);
-                    break;
-                case GB18030_FOUR_BYTE:
-                    int offset = (((byte1 - 0x81) * 10 +
-                                   (byte2 - 0x30)) * 126 +
-                                    byte3 - 0x81) * 10 + byte4 - 0x30;
-                    int hiByte = (offset >>8) & 0xFF;
-                    int lowByte = (offset & 0xFF);
-
-                // Mixture of table lookups and algorithmic calculation
-                // of character values.
-
-                // BMP Ranges
-
-                if (offset <= 0x4A62)
-                    output[charOff++] = getChar(offset);
-                else if (offset > 0x4A62 && offset <= 0x82BC)
-                    output[charOff++] = (char) (offset + 0x5543);
-                else if (offset >= 0x82BD && offset <= 0x830D)
-                    output[charOff++] = getChar(offset);
-                else if (offset >= 0x830D && offset <= 0x93A8)
-                    output[charOff++] = (char) (offset + 0x6557);
-                else if (offset >= 0x93A9 && offset <= 0x99FB)
-                    output[charOff++] = getChar(offset);
-                // Supplemental UCS planes handled via surrogates
-                else if (offset >= 0x2E248 && offset < 0x12E248) {
-                    if (offset >= 0x12E248) {
-                        if (subMode)
-                           return subChars[0];
-                        else {
-                           badInputLength = 4;
-                           throw new UnknownCharacterException();
-                        }
-                    }
-
-                    if (charOff +2 > outEnd) {
-                        throw new ConversionBufferFullException();
-                    }
-                    offset -= 0x1e248;
-                    char highSurr = (char) ((offset - 0x10000) / 0x400 + 0xD800);
-                    char lowSurr = (char) ((offset - 0x10000) % 0x400 + 0xDC00);
-                    output[charOff++] = highSurr;
-                    output[charOff++] = lowSurr;
-                }
-                else {
-                    badInputLength = 4;
-                    throw new MalformedInputException();
-                    }
-                break;
-              }
-        byteOff += inputSize;
-        }
-
-        byteOff += savedSize;
-        return charOff - outOff;
-    }
-
-    public void reset() {
-        byteOff = charOff = 0;
-        currentState = GB18030_DOUBLE_BYTE;
-        savedSize = 0;
-    }
-
-    public String getCharacterEncoding() {
-        return "GB18030";
-    }
-
-    private char getChar(int offset) throws UnknownCharacterException {
-        int byte1 = (offset >>8) & 0xFF;
-        int byte2 = (offset & 0xFF);
-        int start = 0, end = 0xFF;
-
-        if (((byte1 < 0) || (byte1 > getOuter().length))
-             || ((byte2 < start) || (byte2 > end))) {
-                if (subMode)
-                   return subChars[0];
-                else {
-                   badInputLength = 1;
-                   throw new UnknownCharacterException();
-                }
-        }
-
-        int n = (decoderIndex1[byte1] & 0xf) * (end - start + 1) + (byte2 - start);
-        return decoderIndex2[decoderIndex1[byte1] >> 4].charAt(n);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharGB18030DB.java b/src/share/classes/sun/io/ByteToCharGB18030DB.java
deleted file mode 100644
index d1766df..0000000
--- a/src/share/classes/sun/io/ByteToCharGB18030DB.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.GB18030;
-
-
-/**
- * Tables and data to convert the two-byte portion of GB18030 to Unicode
- * The class is package level accessibility as it is just used for the
- * convenience of the main GB18030 converter.
- *
- * @author  ConverterGenerator tool
- */
-
-abstract class ByteToCharGB18030DB extends ByteToCharDoubleByte {
-
-    public String getCharacterEncoding() {
-        return "ByteToCharGB18030DB";
-    }
-
-    public ByteToCharGB18030DB() {
-        GB18030 nioCoder = new GB18030();
-        super.index1 = nioCoder.getSubDecoderIndex1();
-        super.index2 = nioCoder.getSubDecoderIndex2();
-        start = 0x40;
-        end = 0xFE;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharGBK.java b/src/share/classes/sun/io/ByteToCharGBK.java
deleted file mode 100644
index 2840489..0000000
--- a/src/share/classes/sun/io/ByteToCharGBK.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharGBK extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new GBK().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "GBK";
-    }
-
-    public ByteToCharGBK() {
-        super(dec);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISCII91.java b/src/share/classes/sun/io/ByteToCharISCII91.java
deleted file mode 100644
index baa1bca..0000000
--- a/src/share/classes/sun/io/ByteToCharISCII91.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.ISCII91;
-
-/*
- * Copyright (c) 1998 International Business Machines.
- * All Rights Reserved.
- *
- * Author : Sunanda Bera, C. Thirumalesh
- * Last Modified : 23,November,1998
- *
- * Purpose : Defines class ByteToCharISCII91.
- *
- *
- * Revision History
- * ======== =======
- *
- * Date        By            Description
- * ----        --            -----------
- *
- *
- */
-
-/**
- * Converter class. Converts between Unicode encoding and ISCII91 encoding.
- * ISCII91 is the character encoding as defined in Indian Standard document
- * IS 13194:1991 ( Indian Script Code for Information Interchange ).
- *
- * @see sun.io.ByteToCharConverter
- */
-public class ByteToCharISCII91 extends ByteToCharConverter {
-
-    private static final char[] directMapTable = ISCII91.getDirectMapTable();
-
-    private static final char NUKTA_CHAR = '\u093c';
-    private static final char HALANT_CHAR = '\u094d';
-    private static final char ZWNJ_CHAR = '\u200c';
-    private static final char ZWJ_CHAR = '\u200d';
-    private static final char INVALID_CHAR = '\uffff';
-
-    private char contextChar = INVALID_CHAR;
-    private boolean needFlushing = false;
-
-/**
- * Converts ISCII91 characters to Unicode.
- * @see sun.io.ByteToCharConverter#convert
- */
-    public int convert(byte input[], int inStart, int inEnd,
-                        char output[], int outStart, int outEnd)
-    throws ConversionBufferFullException, UnknownCharacterException {
-        /*Rules:
-         * 1)ATR,EXT,following character to be replaced with '\ufffd'
-         * 2)Halant + Halant => '\u094d' (Virama) + '\u200c'(ZWNJ)
-         * 3)Halant + Nukta => '\u094d' (Virama) + '\u200d'(ZWJ)
-         */
-        charOff = outStart;
-        byteOff = inStart;
-        while (byteOff < inEnd) {
-            if (charOff >= outEnd) {
-                throw new ConversionBufferFullException();
-            }
-            int index = input[byteOff++];
-            index = ( index < 0 )? ( index + 255 ):index;
-            char currentChar = directMapTable[index];
-
-            // if the contextChar is either ATR || EXT set the output to '\ufffd'
-            if(contextChar == '\ufffd') {
-                output[charOff++] = '\ufffd';
-                contextChar = INVALID_CHAR;
-                needFlushing = false;
-                continue;
-            }
-
-            switch(currentChar) {
-            case '\u0901':
-            case '\u0907':
-            case '\u0908':
-            case '\u090b':
-            case '\u093f':
-            case '\u0940':
-            case '\u0943':
-            case '\u0964':
-                if(needFlushing) {
-                    output[charOff++] = contextChar;
-                    contextChar = currentChar;
-                    continue;
-                }
-                contextChar = currentChar;
-                needFlushing = true;
-                continue;
-            case NUKTA_CHAR:
-                switch(contextChar) {
-                case '\u0901':
-                    output[charOff] = '\u0950';
-                    break;
-                case '\u0907':
-                    output[charOff] = '\u090c';
-                    break;
-                case '\u0908':
-                    output[charOff] = '\u0961';
-                    break;
-                case '\u090b':
-                    output[charOff] = '\u0960';
-                    break;
-                case '\u093f':
-                    output[charOff] = '\u0962';
-                    break;
-                case '\u0940':
-                    output[charOff] = '\u0963';
-                    break;
-                case '\u0943':
-                    output[charOff] = '\u0944';
-                    break;
-                case '\u0964':
-                    output[charOff] = '\u093d';
-                    break;
-                case HALANT_CHAR:
-                    if(needFlushing) {
-                        output[charOff++] = contextChar;
-                        contextChar = currentChar;
-                        continue;
-                    }
-                    output[charOff] = ZWJ_CHAR;
-                    break;
-                default:
-                    if(needFlushing) {
-                        output[charOff++] = contextChar;
-                        contextChar = currentChar;
-                        continue;
-                    }
-                    output[charOff] = NUKTA_CHAR;
-                }
-                break;
-            case HALANT_CHAR:
-                if(needFlushing) {
-                    output[charOff++] = contextChar;
-                    contextChar = currentChar;
-                    continue;
-                }
-                if(contextChar == HALANT_CHAR) {
-                    output[charOff] = ZWNJ_CHAR;
-                    break;
-                }
-                output[charOff] = HALANT_CHAR;
-                break;
-            case INVALID_CHAR:
-                if(needFlushing) {
-                    output[charOff++] = contextChar;
-                    contextChar = currentChar;
-                    continue;
-                }
-                if(subMode) {
-                    output[charOff] = subChars[0];
-                    break;
-                } else {
-                    contextChar = INVALID_CHAR;
-                    throw new UnknownCharacterException();
-                }
-            default:
-                if(needFlushing) {
-                    output[charOff++] = contextChar;
-                    contextChar = currentChar;
-                    continue;
-                }
-                output[charOff] = currentChar;
-                break;
-        }//end switch
-
-        contextChar = currentChar;
-        needFlushing = false;
-        charOff++;
-        }//end while
-        return charOff - outStart;
-    } //convert()
-
-/**
- * @see sun.io.ByteToCharConverter#flush
- */
-    public  int flush( char[] output, int outStart, int outEnd )
-    throws MalformedInputException, ConversionBufferFullException
-    {
-        int charsWritten = 0;
-        //if the last char was not flushed, flush it!
-        if(needFlushing) {
-            output[outStart] = contextChar;
-            charsWritten = 1;
-        }
-        contextChar = INVALID_CHAR;
-        needFlushing = false;
-        byteOff = charOff = 0;
-        return charsWritten;
-    }//flush()
-/**
- * Returns the character set id for the conversion.
- */
-    public String getCharacterEncoding()
-    {
-        return "ISCII91";
-    }//getCharacterEncoding()
-/**
- * @see sun.io.ByteToCharConverter#reset
- */
-    public void reset()
-    {
-        byteOff = charOff = 0;
-    }//reset()
-
-}//end of class definition
diff --git a/src/share/classes/sun/io/ByteToCharISO2022.java b/src/share/classes/sun/io/ByteToCharISO2022.java
deleted file mode 100644
index f827972..0000000
--- a/src/share/classes/sun/io/ByteToCharISO2022.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * An algorithmic conversion from ISO 2022 to Unicode
- *
- * @author Tom Zhou
- */
-public abstract class ByteToCharISO2022 extends ByteToCharConverter
-{
-    // Value to be filled by subclass
-    protected String SODesignator[];
-    protected String SS2Designator[] = null;
-    protected String SS3Designator[] = null;
-
-    protected ByteToCharConverter SOConverter[];
-    protected ByteToCharConverter SS2Converter[] = null;
-    protected ByteToCharConverter SS3Converter[] = null;
-
-    private static final byte ISO_ESC = 0x1b;
-    private static final byte ISO_SI = 0x0f;
-    private static final byte ISO_SO = 0x0e;
-    private static final byte ISO_SS2_7 = 0x4e;
-    private static final byte ISO_SS3_7 = 0x4f;
-    private static final byte MSB = (byte)0x80;
-    private static final char REPLACE_CHAR = '\uFFFD';
-    private static final byte maximumDesignatorLength = 3;
-
-    private static final byte SOFlag = 0;
-    private static final byte SS2Flag = 1;
-    private static final byte SS3Flag = 2;
-    private static final byte G0 = 0;
-    private static final byte G1 = 1;
-
-    private ByteToCharConverter tmpConverter[];
-
-    private int curSODes, curSS2Des, curSS3Des;
-    private boolean shiftout;
-
-    private byte remainByte[] = new byte[10];
-    private int remainIndex = -1;
-    private byte state, firstByte;
-
-    public void reset()
-    {
-        int i = 0;
-
-        shiftout = false;
-        state = G0;
-        firstByte = 0;
-
-        curSODes = 0;
-        curSS2Des = 0;
-        curSS3Des = 0;
-
-        charOff = byteOff = 0;
-        remainIndex = -1;
-
-        for(i = 0; i < remainByte.length; i++)
-            remainByte[i] = 0;
-    }
-
-    public int flush(char[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        int i;
-        if (state != G0) {
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        reset();
-        return 0;
-    }
-
-    private byte[] savetyGetSrc(byte[] input, int inOff, int inEnd, int nbytes)
-    {
-        int i;
-        byte tmp[];
-
-        if(inOff <= (inEnd-nbytes+1))
-            tmp = new byte[nbytes];
-        else
-            tmp = new byte[inEnd-inOff];
-
-        for(i = 0; i < tmp.length; i++)
-            tmp[i] = input[inOff+i];
-        return tmp;
-    }
-
-    private char getUnicode(byte byte1, byte byte2, byte shiftFlag)
-    {
-        byte1 |= MSB;
-        byte2 |= MSB;
-
-        byte[] tmpByte = {byte1,byte2};
-        char[] tmpChar = new char[1];
-        int     i = 0,
-                tmpIndex = 0;
-
-        switch(shiftFlag) {
-        case SOFlag:
-            tmpIndex = curSODes;
-            tmpConverter = SOConverter;
-            break;
-        case SS2Flag:
-            tmpIndex = curSS2Des;
-            tmpConverter = SS2Converter;
-            break;
-        case SS3Flag:
-            tmpIndex = curSS3Des;
-            tmpConverter = SS3Converter;
-            break;
-        }
-
-        for(i = 0; i < tmpConverter.length; i++) {
-            if(tmpIndex == i) {
-                try {
-                    tmpConverter[i].convert(tmpByte, 0, 2, tmpChar, 0, 1);
-                } catch (Exception e) {}
-                return tmpChar[0];
-            }
-        }
-        return REPLACE_CHAR;
-    }
-
-    public final int convert(byte[] input, int inOff, int inEnd,
-                             char[] output, int outOff, int outEnd)
-                             throws ConversionBufferFullException,
-                                    MalformedInputException
-    {
-        int i;
-        int DesignatorLength = 0;
-        charOff  =  outOff;
-        byteOff  =  inOff;
-
-        // Loop until we hit the end of the input
-        while (byteOff < inEnd) {
-            // If we don't have room for the output, throw an exception
-            if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-            if(remainIndex < 0) {
-                remainByte[0] = input[byteOff];
-                remainIndex = 0;
-                byteOff++;
-            }
-            switch (remainByte[0]) {
-            case ISO_SO:
-                shiftout = true;
-                if(remainIndex > 0)
-                    System.arraycopy(remainByte, 1, remainByte, 0, remainIndex);
-                remainIndex--;
-                break;
-            case ISO_SI:
-                shiftout = false;
-                if(remainIndex > 0)
-                    System.arraycopy(remainByte, 1, remainByte, 0, remainIndex);
-                remainIndex--;
-                break;
-             case ISO_ESC:
-                byte tmp[] = savetyGetSrc(input, byteOff, inEnd,
-                               (maximumDesignatorLength-remainIndex));
-                System.arraycopy(tmp, 0, remainByte, remainIndex+1, tmp.length);
-                remainIndex += tmp.length;
-                byteOff += tmp.length;
-                if(tmp.length<(maximumDesignatorLength-remainIndex))
-                    break;
-                String tmpString = new String(remainByte, 1, remainIndex);
-                for (i = 0; i < SODesignator.length; i++) {
-                    if(tmpString.indexOf(SODesignator[i]) == 0) {
-                        curSODes = i;
-                        DesignatorLength = SODesignator[i].length();
-                        break;
-                    }
-                }
-
-                if (DesignatorLength == 0 ) { // Designator not recognized
-                   badInputLength = tmp.length;
-                   throw new MalformedInputException();
-                }
-
-                if (i == SODesignator.length) {
-                    for (i = 0; i < SS2Designator.length; i++) {
-                        if(tmpString.indexOf(SS2Designator[i]) == 0) {
-                            curSS2Des = i;
-                            DesignatorLength = SS2Designator[i].length();
-                            break;
-                        }
-                    }
-                    if(i == SS2Designator.length) {
-                        for(i = 0; i < SS3Designator.length; i++) {
-                            if (tmpString.indexOf(SS3Designator[i]) == 0) {
-                                curSS3Des = i;
-                                DesignatorLength = SS3Designator[i].length();
-                                break;
-                            }
-                        }
-                        if (i == SS3Designator.length) {
-                            switch(remainByte[1]) {
-                            case ISO_SS2_7:
-                                output[charOff] = getUnicode(remainByte[2],
-                                                          remainByte[3],
-                                                          SS2Flag);
-                                charOff++;
-                                DesignatorLength = 3;
-                                break;
-                            case ISO_SS3_7:
-                                output[charOff] = getUnicode(remainByte[2],
-                                                          remainByte[3],
-                                                          SS3Flag);
-                                charOff++;
-                                DesignatorLength = 3;
-                                break;
-                            default:
-                                DesignatorLength = 0;
-                            }
-                        }
-                    }
-                }
-                if (remainIndex > DesignatorLength) {
-                    for(i = 0; i < remainIndex-DesignatorLength; i++)
-                        remainByte[i] = remainByte[DesignatorLength+1+i];
-                    remainIndex = i-1;
-                } else {
-                    remainIndex = -1;
-                }
-                break;
-            default:
-                if (!shiftout) {
-                    output[charOff] = (char)remainByte[0];
-                    charOff++;
-                } else {
-                    switch (state) {
-                    case G0:
-                        firstByte = remainByte[0];
-                        state = G1;
-                        break;
-                    case G1:
-                        output[charOff] = getUnicode(firstByte, remainByte[0],
-                                                  SOFlag);
-                        charOff++;
-                        state = G0;
-                        break;
-                    }
-                }
-                if (remainIndex > 0)
-                    System.arraycopy(remainByte, 1, remainByte, 0, remainIndex);
-                remainIndex--;
-            }
-        }
-        return charOff - outOff;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO2022CN.java b/src/share/classes/sun/io/ByteToCharISO2022CN.java
deleted file mode 100644
index 1213606..0000000
--- a/src/share/classes/sun/io/ByteToCharISO2022CN.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * @author Tom Zhou
- */
-public class ByteToCharISO2022CN extends ByteToCharConverter
-{
-    private String SODesignator[];
-    private String SS2Designator[] = null;
-    private String SS3Designator[] = null;
-    private ByteToCharConverter SOConverter[];
-    private ByteToCharConverter SS2Converter[] = null;
-    private ByteToCharConverter SS3Converter[] = null;
-
-    private static final byte ISO_ESC = 0x1b;
-    private static final byte ISO_SI = 0x0f;
-    private static final byte ISO_SO = 0x0e;
-    private static final byte ISO_SS2_7 = 0x4e;
-    private static final byte ISO_SS3_7 = 0x4f;
-    private static final byte MSB = (byte)0x80;
-    private static final char REPLACE_CHAR = '\uFFFD';
-    private static final byte maximumDesignatorLength = 3;
-
-    private static final byte SOFlag = 0;
-    private static final byte SS2Flag = 1;
-    private static final byte SS3Flag = 2;
-    private static final byte G0 = 0;
-    private static final byte G1 = 1;
-
-    private ByteToCharConverter tmpConverter[];
-
-    private int curSODes, curSS2Des, curSS3Des;
-    private boolean shiftout;
-
-    private byte remainByte[] = new byte[10];
-    private int remainIndex = -1;
-    private byte state, firstByte;
-
-    public void reset()
-    {
-        int i = 0;
-
-        shiftout = false;
-        state = G0;
-        firstByte = 0;
-
-        curSODes = 0;
-        curSS2Des = 0;
-        curSS3Des = 0;
-
-        charOff = byteOff = 0;
-        remainIndex = -1;
-
-        for(i = 0; i < remainByte.length; i++)
-            remainByte[i] = 0;
-    }
-
-    public int flush(char[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        int i;
-        if (state != G0) {
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        reset();
-        return 0;
-    }
-
-    private byte[] savetyGetSrc(byte[] input, int inOff, int inEnd, int nbytes)
-    {
-        int i;
-        byte tmp[];
-
-        if(inOff <= (inEnd-nbytes+1))
-            tmp = new byte[nbytes];
-        else
-            tmp = new byte[inEnd-inOff];
-
-        for(i = 0; i < tmp.length; i++)
-            tmp[i] = input[inOff+i];
-        return tmp;
-    }
-
-    private char getUnicode(byte byte1, byte byte2, byte shiftFlag)
-    {
-        byte1 |= MSB;
-        byte2 |= MSB;
-        char[] tmpChar = new char[1];
-
-        switch(shiftFlag) {
-        case SOFlag:
-            try {
-                byte[] tmpByte = {byte1,byte2};
-                SOConverter[curSODes].convert(tmpByte, 0, 2, tmpChar, 0, 1);
-            }
-            catch (Exception e) {}
-            break;
-        case SS2Flag:
-            try {
-                byte[] tmpByte = {(byte)0x8e, (byte)0xa2, byte1, byte2};
-                SS2Converter[curSS2Des].convert(tmpByte, 0, 4, tmpChar, 0, 1);
-            }
-            catch (Exception e){}
-            break;
-        case SS3Flag:
-            try {
-                byte[] tmpByte = {(byte)0x8e, (byte)0xa3, byte1,byte2};
-                SS3Converter[curSS3Des].convert(tmpByte, 0, 4, tmpChar, 0, 1);
-            }
-            catch (Exception e){}
-            break;
-        default:
-            tmpChar[0] = REPLACE_CHAR;
-        }
-        return tmpChar[0];
-    }
-
-    public final int convert(byte[] input, int inOff, int inEnd,
-                             char[] output, int outOff, int outEnd)
-                             throws ConversionBufferFullException,
-                                    MalformedInputException
-    {
-        int i;
-        int DesignatorLength = 0;
-        charOff  =  outOff;
-        byteOff  =  inOff;
-
-        // Loop until we hit the end of the input
-        while (byteOff < inEnd) {
-            // If we don't have room for the output, throw an exception
-            if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-            if(remainIndex < 0) {
-                remainByte[0] = input[byteOff];
-                remainIndex = 0;
-                byteOff++;
-            }
-            switch (remainByte[0]) {
-            case ISO_SO:
-                shiftout = true;
-                if(remainIndex > 0)
-                    System.arraycopy(remainByte, 1, remainByte, 0, remainIndex);
-                remainIndex--;
-                break;
-            case ISO_SI:
-                shiftout = false;
-                if(remainIndex > 0)
-                    System.arraycopy(remainByte, 1, remainByte, 0, remainIndex);
-                remainIndex--;
-                break;
-             case ISO_ESC:
-                byte tmp[] = savetyGetSrc(input, byteOff, inEnd,
-                               (maximumDesignatorLength-remainIndex));
-                System.arraycopy(tmp, 0, remainByte, remainIndex+1, tmp.length);
-
-                remainIndex += tmp.length;
-                byteOff += tmp.length;
-                if(tmp.length<(maximumDesignatorLength-remainIndex))
-                    break;
-                String tmpString = new String(remainByte, 1, remainIndex);
-                for (i = 0; i < SODesignator.length; i++) {
-                    if(tmpString.indexOf(SODesignator[i]) == 0) {
-                        curSODes = i;
-                        DesignatorLength = SODesignator[i].length();
-                        break;
-                    }
-                }
-
-                if (DesignatorLength == 0) { // designator not recognized
-                   badInputLength = tmp.length;
-                   throw new MalformedInputException();
-                }
-
-                if (i == SODesignator.length) {
-                    for (i = 0; i < SS2Designator.length; i++) {
-                        if(tmpString.indexOf(SS2Designator[i]) == 0) {
-                            curSS2Des = i;
-                            DesignatorLength = SS2Designator[i].length();
-                            break;
-                        }
-                    }
-                    if(i == SS2Designator.length) {
-                        for(i = 0; i < SS3Designator.length; i++) {
-                            if (tmpString.indexOf(SS3Designator[i]) == 0) {
-                                curSS3Des = i;
-                                DesignatorLength = SS3Designator[i].length();
-                                break;
-                            }
-                        }
-                        if (i == SS3Designator.length) {
-                            switch(remainByte[1]) {
-                            case ISO_SS2_7:
-                                output[charOff] = getUnicode(remainByte[2],
-                                                          remainByte[3],
-                                                          SS2Flag);
-                                charOff++;
-                                DesignatorLength = 3;
-                                break;
-                            case ISO_SS3_7:
-                                output[charOff] = getUnicode(remainByte[2],
-                                                          remainByte[3],
-                                                          SS3Flag);
-                                charOff++;
-                                DesignatorLength = 3;
-                                break;
-                            default:
-                                DesignatorLength = 0;
-                            }
-                        }
-                    }
-                }
-                if (remainIndex > DesignatorLength) {
-                    for(i = 0; i < remainIndex-DesignatorLength; i++)
-                        remainByte[i] = remainByte[DesignatorLength+1+i];
-                    remainIndex = i-1;
-                } else {
-                    remainIndex = -1;
-                }
-                break;
-            default:
-                if (!shiftout) {
-                    output[charOff] = (char)remainByte[0];
-                    charOff++;
-                } else {
-                    switch (state) {
-                    case G0:
-                        firstByte = remainByte[0];
-                        state = G1;
-                        break;
-                    case G1:
-                        output[charOff] = getUnicode(firstByte, remainByte[0],
-                                                  SOFlag);
-                        charOff++;
-                        state = G0;
-                        break;
-                    }
-                }
-                if (remainIndex > 0)
-                    System.arraycopy(remainByte, 1, remainByte, 0, remainIndex);
-                remainIndex--;
-            }
-        }
-        return charOff - outOff;
-    }
-
-    public ByteToCharISO2022CN()
-    {
-        SODesignator = new String[3];
-        SODesignator[0] = "$A";
-        SODesignator[1] = "$)A";
-        SODesignator[2] = "$)G";
-        SS2Designator = new String[1];
-        SS2Designator[0] = "$*H";
-        SS3Designator = new String[1];
-        SS3Designator[0] = "$+I";
-
-        SOConverter = new ByteToCharConverter[3];
-        SS2Converter = new ByteToCharConverter[1];
-        SS3Converter = new ByteToCharConverter[1];
-
-        try {
-            SOConverter[0] = SOConverter[1]
-                        = ByteToCharConverter.getConverter("GB2312");
-            SOConverter[2] = SS2Converter[0] = SS3Converter[0]
-                        = ByteToCharConverter.getConverter("CNS11643");
-        } catch (Exception e) {};
-    }
-
-    // Return the character set id
-    public String getCharacterEncoding()
-    {
-        return "ISO2022CN";
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO2022JP.java b/src/share/classes/sun/io/ByteToCharISO2022JP.java
deleted file mode 100644
index 0519cf9..0000000
--- a/src/share/classes/sun/io/ByteToCharISO2022JP.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-public class ByteToCharISO2022JP extends ByteToCharJIS0208 {
-
-    private static final int ASCII = 0;                 // ESC ( B
-    private static final int JISX0201_1976 = 1;         // ESC ( J
-    private static final int JISX0208_1978 = 2;         // ESC $ @
-    private static final int JISX0208_1983 = 3;         // ESC $ B
-    private static final int JISX0201_1976_KANA = 4;    // ESC ( I
-    private static final int SHIFTOUT = 5;              // SO (0x0e)
-
-    private int currentState;
-    private int savedSize;
-    private byte[] savedBytes;
-
-    public ByteToCharISO2022JP() {
-        super();
-        savedBytes = new byte[2];
-        currentState = ASCII;
-        savedSize = 0;
-    }
-
-    public int flush(char [] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (savedSize != 0) {
-            savedSize = 0;
-            currentState = ASCII;
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        int previousState = ASCII;
-        int inputSize = 0;
-        char outputChar = '\uFFFD';
-        // readOff keeps the actual buffer's pointer.
-        // byteOff keeps original buffer's pointer.
-        int readOff = byteOff = inOff;
-
-        if (savedSize != 0) {
-            if (savedBytes[0] == 0x1b) { // ESC
-                if ((savedSize == 2 &&
-                     (savedBytes[1] == 0x28 &&
-                      input[0] != 'B' &&
-                      input[0] != 'J' &&
-                      input[0] != 'I') &&
-                     (savedBytes[1] == 0x24 &&
-                      input[0] != '@' &&
-                      input[0] != 'B')) ||
-                    ((savedSize == 1) &&
-                     (input[0] != 0x28 &&
-                      input[0] != 0x24))) {
-                    badInputLength = 0;
-                    throw new MalformedInputException();
-                }
-                if ((inEnd - inOff) == 1 && savedSize == 1 &&
-                    savedBytes[0] == 0x1b) {
-                    savedSize = 2;
-                    savedBytes[1] = input[0];
-                    byteOff++;
-                    return 0;
-                }
-            }
-            byte[] newBuf = new byte[inEnd - inOff + savedSize];
-            for (int i = 0; i < savedSize; i++) {
-                newBuf[i] = savedBytes[i];
-            }
-            System.arraycopy(input, inOff, newBuf, savedSize, inEnd - inOff);
-            byteOff -= savedSize;
-            input = newBuf;
-            inOff = 0;
-            inEnd = newBuf.length;
-            savedSize = 0;
-        }
-
-        charOff = outOff;
-        readOff = inOff;
-
-        while(readOff < inEnd) {
-            int byte1, byte2, byte3;
-            boolean noOutput = false;
-
-            // Is there room in the output buffer for the result?
-            if (charOff >= outEnd) {
-                throw new ConversionBufferFullException();
-            }
-
-            // Get the input byte
-            byte1 = input[readOff] & 0xFF;
-            inputSize = 1;
-
-            if ((byte1 & (byte)0x80) != 0){
-                badInputLength = 1;
-                throw new MalformedInputException();
-            }
-
-            // Is this a escape sequence?
-            while (byte1 == 0x1b || byte1 == 0x0e || byte1 == 0x0f) {
-                if (byte1 == 0x1b){  // ESC
-                    if (readOff + inputSize + 1 >= inEnd) {
-                        if (readOff + inputSize >= inEnd) {
-                            savedSize = 1;
-                            savedBytes[0] = (byte)byte1;
-                        } else {
-                            savedSize = 2;
-                            savedBytes[0] = (byte)byte1;
-                            savedBytes[1] = input[readOff + inputSize];
-                            inputSize++;
-                        }
-                        break;
-                    }
-                    byte2 = input[readOff + inputSize] & 0xFF;
-                    inputSize++;
-                    if ((byte2 & (byte)0x80) != 0){
-                        badInputLength = 2;
-                        throw new MalformedInputException();
-                    }
-                    if (byte2 == 0x28){
-                        byte3 = input[readOff + inputSize] & 0xFF;
-                        inputSize++;
-                        if (byte3 == 'B'){
-                            currentState = ASCII;
-                        } else if (byte3 == 'J'){
-                            currentState = JISX0201_1976;
-                        } else if (byte3 == 'I'){
-                            currentState = JISX0201_1976_KANA;
-                        } else {
-                            // illegal ESC sequence
-                            badInputLength = 3;
-                            throw new MalformedInputException();
-                        }
-                    } else if (byte2 == '$'){
-                        byte3 = input[readOff + inputSize] & 0xFF;
-                        inputSize++;
-                        if ((byte3 & (byte)0x80) != 0){
-                            badInputLength = 3;
-                            throw new MalformedInputException();
-                        }
-                        if (byte3 == '@'){
-                            currentState = JISX0208_1978;
-                        } else if (byte3 == 'B'){
-                            currentState = JISX0208_1983;
-                        } else {
-                            // illegal ESC sequence
-                            badInputLength = 3;
-                            throw new MalformedInputException();
-                        }
-                    } else {
-                        // illegal ESC sequence
-                        badInputLength = 2;
-                        throw new MalformedInputException();
-                    }
-                    if (readOff + inputSize >= inEnd) {
-                        noOutput = true;
-                        break;
-                    } else {
-                        byte1 = input[readOff + inputSize];
-                        inputSize++;
-                    }
-                } else if (byte1 == 0x0e){  // shift out for one byte kana
-                    previousState = currentState;
-                    currentState = SHIFTOUT;
-                    if (readOff + inputSize >= inEnd) {
-                        noOutput = true;
-                        break;
-                    }
-                    byte1 = input[readOff + inputSize];
-                    inputSize++;
-                    if ((byte1 & (byte)0x80) != 0){
-                        badInputLength = 1;
-                        throw new MalformedInputException();
-                    }
-                } else if (byte1 == 0x0f){  // shift in for previous mode
-                    currentState = previousState;
-                    if (readOff + inputSize >= inEnd) {
-                        noOutput = true;
-                        break;
-                    }
-                    byte1 = input[readOff + inputSize];
-                    inputSize++;
-                    if ((byte1 & (byte)0x80) != 0){
-                        badInputLength = 1;
-                        throw new MalformedInputException();
-                    }
-                }
-            }
-            if (noOutput || savedSize != 0) {
-                byteOff += inputSize;
-                break;
-            }
-            noOutput = false;
-            switch (currentState){
-              case ASCII:
-                outputChar = (char)(byte1 & 0xff);
-                break;
-              case JISX0201_1976:
-                switch (byte1) {
-                  case 0x5c:
-                    outputChar = '\u00a5';
-                    break;
-                  case 0x7e:
-                    outputChar = '\u203e';
-                    break;
-                  default:
-                    outputChar = (char)byte1;
-                    break;
-                }
-                break;
-              case JISX0208_1978:
-              case JISX0208_1983:
-                if (readOff + inputSize >= inEnd) {
-                    savedSize = 1;
-                    savedBytes[0] = (byte)byte1;
-                    break;
-                }
-                byte2 = input[readOff + inputSize] & 0xff;
-                inputSize++;
-                if ((byte2 & (byte)0x80) != 0){
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-                // jisx0208Chars table convert FULLWIDTH_REVERSE_SOLIDUS
-                // 0x2140 to REVERSE_SOLIDUS (BACKSLASH) 0x5c.
-                // This behavior causes problem because
-                // 0x5c is special escape character for java.
-                if (byte1 == 0x21 && byte2 == 0x40) {
-                    outputChar = '\uFF3C';
-                } else {
-                    try {
-                        outputChar = getUnicode(byte1, byte2);
-                    } catch (ArrayIndexOutOfBoundsException e) {
-                        outputChar = '\uFFFD';
-                    }
-                }
-                break;
-              case JISX0201_1976_KANA:
-              case SHIFTOUT:
-                if (byte1 > 0x60) {
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-                outputChar = (char)(byte1 + 0xff40);
-                break;
-            }
-
-            if (savedSize != 0) {
-                byteOff += inputSize;
-                break;
-            }
-
-            if (outputChar == '\uFFFD') {
-                if (subMode)
-                    outputChar = subChars[0];
-                else {
-                    badInputLength = inputSize;
-                    throw new UnknownCharacterException();
-                }
-            }
-            readOff += inputSize;
-            byteOff += inputSize;
-            output[charOff++] = outputChar;
-        }
-
-        return charOff - outOff;
-    }
-
-    public void reset() {
-        byteOff = charOff = 0;
-        currentState = ASCII;
-        savedSize = 0;
-    }
-
-    public String getCharacterEncoding() {
-        return "ISO2022JP";
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO2022KR.java b/src/share/classes/sun/io/ByteToCharISO2022KR.java
deleted file mode 100644
index 40514db..0000000
--- a/src/share/classes/sun/io/ByteToCharISO2022KR.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-public class ByteToCharISO2022KR extends ByteToCharISO2022
-{
-    public ByteToCharISO2022KR()
-    {
-        SODesignator = new String[1];
-        SODesignator[0] = "$)C";
-
-        SOConverter = new ByteToCharConverter[1];
-
-        try {
-            SOConverter[0] = ByteToCharConverter.getConverter("KSC5601");
-        } catch (Exception e) {};
-    }
-
-    // Return the character set id
-    public String getCharacterEncoding()
-    {
-        return "ISO2022KR";
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_1.java b/src/share/classes/sun/io/ByteToCharISO8859_1.java
deleted file mode 100644
index b9cb76a..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_1.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1996, 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-/**
-* A algorithmic conversion from ISO 8859-1 to Unicode
-*
-* @author Lloyd Honomichl
-* @author Asmus Freytag
-*/
-public class ByteToCharISO8859_1 extends ByteToCharConverter {
-
-    // Return the character set id
-    public String getCharacterEncoding()
-    {
-        return "ISO8859_1";
-    }
-
-    public int flush(char[] output, int outStart, int outEnd) {
-        // This converter will not buffer any data.
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    /**
-    * Algorithmic character conversion
-    */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-
-        throws ConversionBufferFullException
-    {
-        int bound = inOff + (outEnd - outOff);
-        if (bound >= inEnd) {
-             bound = inEnd;
-        }
-        int bytesWritten = inEnd - inOff;
-
-
-        // Loop until we hit the end of the input
-        try {
-            while(inOff < bound) {
-                output[outOff++] = (char) (0xff & input[inOff++]);
-            }
-        } finally {
-            charOff = outOff;
-            byteOff = inOff;
-        }
-
-        // If we don't have room for the output, throw an exception
-        if (bound < inEnd)
-            throw new ConversionBufferFullException();
-
-        // Return the length written to the output buffer
-        return bytesWritten;
-    }
-
-    /*
-        Reset after finding bad input
-    */
-    public void reset() {
-        byteOff = charOff = 0;
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_13.java b/src/share/classes/sun/io/ByteToCharISO8859_13.java
deleted file mode 100644
index a6d0e1b..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_13.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_13;
-
-/**
- * A table to convert ISO8859_13 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_13 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_13 nioCoder = new ISO_8859_13();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_13";
-    }
-
-    public ByteToCharISO8859_13() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_15.java b/src/share/classes/sun/io/ByteToCharISO8859_15.java
deleted file mode 100644
index 40428f4..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_15.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_15;
-
-/**
- * A table to convert ISO8859_15 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_15 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_15 nioCoder = new ISO_8859_15();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_15";
-    }
-
-    public ByteToCharISO8859_15() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_2.java b/src/share/classes/sun/io/ByteToCharISO8859_2.java
deleted file mode 100644
index 21befbf..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_2.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_2;
-
-/**
- * A table to convert ISO8859_2 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_2 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_2 nioCoder = new ISO_8859_2();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_2";
-    }
-
-    public ByteToCharISO8859_2() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_3.java b/src/share/classes/sun/io/ByteToCharISO8859_3.java
deleted file mode 100644
index 1d84bbb..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_3.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.ISO_8859_3;
-
-/**
- * A table to convert ISO8859_3 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_3 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_3 nioCoder = new ISO_8859_3();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_3";
-    }
-
-    public ByteToCharISO8859_3() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_4.java b/src/share/classes/sun/io/ByteToCharISO8859_4.java
deleted file mode 100644
index 6281b55..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_4.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_4;
-
-/**
- * A table to convert ISO8859_4 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_4 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_4 nioCoder = new ISO_8859_4();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_4";
-    }
-
-    public ByteToCharISO8859_4() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_5.java b/src/share/classes/sun/io/ByteToCharISO8859_5.java
deleted file mode 100644
index bf798bd..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_5.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_5;
-
-/**
- * A table to convert ISO8859_5 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_5 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_5 nioCoder = new ISO_8859_5();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_5";
-    }
-
-    public ByteToCharISO8859_5() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_6.java b/src/share/classes/sun/io/ByteToCharISO8859_6.java
deleted file mode 100644
index 2acee21..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_6.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.ISO_8859_6;
-
-/**
- * A table to convert ISO8859_6 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_6 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_6 nioCoder = new ISO_8859_6();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_6";
-    }
-
-    public ByteToCharISO8859_6() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_7.java b/src/share/classes/sun/io/ByteToCharISO8859_7.java
deleted file mode 100644
index 440e76c..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_7.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_7;
-
-
-/**
- * A table to convert ISO8859_7 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_7 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_7 nioCoder = new ISO_8859_7();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_7";
-    }
-
-    public ByteToCharISO8859_7() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_8.java b/src/share/classes/sun/io/ByteToCharISO8859_8.java
deleted file mode 100644
index 565e3bd..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_8.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.ISO_8859_8;
-
-/**
- * A table to convert ISO8859_8 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_8 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_8 nioCoder = new ISO_8859_8();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_8";
-    }
-
-    public ByteToCharISO8859_8() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharISO8859_9.java b/src/share/classes/sun/io/ByteToCharISO8859_9.java
deleted file mode 100644
index 7bedec0..0000000
--- a/src/share/classes/sun/io/ByteToCharISO8859_9.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_9;
-
-/**
- * A table to convert ISO8859_9 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharISO8859_9 extends ByteToCharSingleByte {
-
-    private final static ISO_8859_9 nioCoder = new ISO_8859_9();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_9";
-    }
-
-    public ByteToCharISO8859_9() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharJIS0201.java b/src/share/classes/sun/io/ByteToCharJIS0201.java
deleted file mode 100644
index e84cab6..0000000
--- a/src/share/classes/sun/io/ByteToCharJIS0201.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table to convert JIS0201 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-class ByteToCharJIS0201 extends ByteToCharSingleByte {
-
-    public String getCharacterEncoding() {
-        return "JIS0201";
-    }
-
-    public ByteToCharJIS0201() {
-        super.byteToCharTable = byteToCharTable;
-    }
-
-    private final static String byteToCharTable =
-
-        "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +    // 0x80 - 0x87
-        "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +    // 0x88 - 0x8F
-        "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +    // 0x90 - 0x97
-        "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +    // 0x98 - 0x9F
-        "\uFFFD\uFF61\uFF62\uFF63\uFF64\uFF65\uFF66\uFF67" +    // 0xA0 - 0xA7
-        "\uFF68\uFF69\uFF6A\uFF6B\uFF6C\uFF6D\uFF6E\uFF6F" +    // 0xA8 - 0xAF
-        "\uFF70\uFF71\uFF72\uFF73\uFF74\uFF75\uFF76\uFF77" +    // 0xB0 - 0xB7
-        "\uFF78\uFF79\uFF7A\uFF7B\uFF7C\uFF7D\uFF7E\uFF7F" +    // 0xB8 - 0xBF
-        "\uFF80\uFF81\uFF82\uFF83\uFF84\uFF85\uFF86\uFF87" +    // 0xC0 - 0xC7
-        "\uFF88\uFF89\uFF8A\uFF8B\uFF8C\uFF8D\uFF8E\uFF8F" +    // 0xC8 - 0xCF
-        "\uFF90\uFF91\uFF92\uFF93\uFF94\uFF95\uFF96\uFF97" +    // 0xD0 - 0xD7
-        "\uFF98\uFF99\uFF9A\uFF9B\uFF9C\uFF9D\uFF9E\uFF9F" +    // 0xD8 - 0xDF
-        "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +    // 0xE0 - 0xE7
-        "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +    // 0xE8 - 0xEF
-        "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +    // 0xF0 - 0xF7
-        "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +    // 0xF8 - 0xFF
-        "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" +    // 0x00 - 0x07
-        "\b\t\n\u000B\f\r\u000E\u000F" +        // 0x08 - 0x0F
-        "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" +    // 0x10 - 0x17
-        "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" +    // 0x18 - 0x1F
-        "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" +    // 0x20 - 0x27
-        "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" +    // 0x28 - 0x2F
-        "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" +    // 0x30 - 0x37
-        "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" +    // 0x38 - 0x3F
-        "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" +    // 0x40 - 0x47
-        "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" +    // 0x48 - 0x4F
-        "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" +    // 0x50 - 0x57
-        "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" +        // 0x58 - 0x5F
-        "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" +    // 0x60 - 0x67
-        "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" +    // 0x68 - 0x6F
-        "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" +    // 0x70 - 0x77
-        "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F";     // 0x78 - 0x7F
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharJIS0208.java b/src/share/classes/sun/io/ByteToCharJIS0208.java
deleted file mode 100644
index fb674e2..0000000
--- a/src/share/classes/sun/io/ByteToCharJIS0208.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-/**
- * Tables and data to convert JIS0208 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-import sun.nio.cs.ext.JIS_X_0208_Decoder;
-
-public class ByteToCharJIS0208 extends ByteToCharDoubleByte {
-
-    public String getCharacterEncoding() {
-        return "JIS0208";
-    }
-
-    public ByteToCharJIS0208() {
-        super.index1 = JIS_X_0208_Decoder.getIndex1();
-        super.index2 = JIS_X_0208_Decoder.getIndex2();
-        start = 0x21;
-        end = 0x7E;
-    }
-
-    protected char convSingleByte(int b) {
-        //Fix bug#4179800 - JIS0208 is 7bit,double-byte encoding
-        return REPLACE_CHAR;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharJIS0208_Solaris.java b/src/share/classes/sun/io/ByteToCharJIS0208_Solaris.java
deleted file mode 100644
index 2b64b6e..0000000
--- a/src/share/classes/sun/io/ByteToCharJIS0208_Solaris.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0208_Solaris_Decoder;
-
-/**
- * Tables and data to convert JIS0208_Solaris to Unicode
- *
- * Vendor defined chars added for benefit of vendor defined character
- * supplemented mappings for EUC-JP-Solaris/PCK Solaris variants of EUC-JP
- * and SJIS/Shift_JIS (4765370)
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharJIS0208_Solaris extends ByteToCharDoubleByte {
-
-    public String getCharacterEncoding() {
-        return "JIS0208_Solaris";
-    }
-
-    protected char convSingleByte(int b) {
-        //Fix bug#4179800 - JIS0208 is 7bit,double-byte encoding
-        return REPLACE_CHAR;
-    }
-
-    public ByteToCharJIS0208_Solaris() {
-        super.index1 = JIS_X_0208_Solaris_Decoder.getIndex1();
-        super.index2 = JIS_X_0208_Solaris_Decoder.getIndex2();
-        start = 0x21;
-        end = 0x7E;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharJIS0212.java b/src/share/classes/sun/io/ByteToCharJIS0212.java
deleted file mode 100644
index bc9486f..0000000
--- a/src/share/classes/sun/io/ByteToCharJIS0212.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0212_Decoder;
-
-/**
- * Tables and data to convert JIS0212 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-
-public class ByteToCharJIS0212 extends ByteToCharDoubleByte {
-
-    public String getCharacterEncoding() {
-        return "JIS0212";
-    }
-
-    protected char convSingleByte(int b) {
-        //Fix bug#4179800 - JIS0212 is 7bit,double-byte encoding
-        return REPLACE_CHAR;
-    }
-
-    public ByteToCharJIS0212() {
-        super.index1 = JIS_X_0212_Decoder.getIndex1();
-        super.index2 = JIS_X_0212_Decoder.getIndex2();
-        start = 0x21;
-        end = 0x7E;
-     }
-}
diff --git a/src/share/classes/sun/io/ByteToCharJIS0212_Solaris.java b/src/share/classes/sun/io/ByteToCharJIS0212_Solaris.java
deleted file mode 100644
index 8ea0247..0000000
--- a/src/share/classes/sun/io/ByteToCharJIS0212_Solaris.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0212_Solaris_Decoder;
-
-/**
- * Tables and data to convert JIS0212_Solaris to Unicode
- * Solaris ==> vendor defined characters -- NEC row 13 + IBM extended
- *         selected character set.
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharJIS0212_Solaris extends ByteToCharDoubleByte {
-
-    public String getCharacterEncoding() {
-        return "JIS0212_Solaris";
-    }
-
-    protected char convSingleByte(int b) {
-        //Fix bug#4179800 - JIS0212 is 7bit,double-byte encoding
-        return REPLACE_CHAR;
-    }
-
-    public ByteToCharJIS0212_Solaris() {
-        super.index1 = JIS_X_0212_Solaris_Decoder.getIndex1();
-        super.index2 = JIS_X_0212_Solaris_Decoder.getIndex2();
-        start = 0x21;
-        end = 0x7E;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharJISAutoDetect.java b/src/share/classes/sun/io/ByteToCharJISAutoDetect.java
deleted file mode 100644
index 47cc33c..0000000
--- a/src/share/classes/sun/io/ByteToCharJISAutoDetect.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import java.io.UnsupportedEncodingException;
-import sun.nio.cs.ext.JISAutoDetect;
-
-public class ByteToCharJISAutoDetect extends ByteToCharConverter {
-
-    private final static int EUCJP_MASK = 0x01;
-    private final static int SJIS2B_MASK = 0x02;
-    private final static int SJIS1B_MASK = 0x04;
-    private final static int EUCJP_KANA1_MASK = 0x08;
-    private final static int EUCJP_KANA2_MASK = 0x10;
-    private final static byte[] maskTable1 = JISAutoDetect.getByteMask1();
-    private final static byte[] maskTable2 = JISAutoDetect.getByteMask2();
-
-    private final static int SS2 = 0x8e;
-    private final static int SS3 = 0x8f;
-
-    // SJISName is set to either "SJIS" or "MS932"
-    private String SJISName;
-    private String EUCJPName;
-
-    private String convName = null;
-    private ByteToCharConverter detectedConv = null;
-    private ByteToCharConverter defaultConv = null;
-
-    public ByteToCharJISAutoDetect() {
-        super();
-        SJISName = CharacterEncoding.getSJISName();
-        EUCJPName = CharacterEncoding.getEUCJPName();
-        defaultConv = new ByteToCharISO8859_1();
-        defaultConv.subChars = subChars;
-        defaultConv.subMode = subMode;
-    }
-
-    public int flush(char [] output, int outStart, int outEnd)
-        throws MalformedInputException, ConversionBufferFullException
-    {
-        badInputLength = 0;
-        if(detectedConv != null)
-             return detectedConv.flush(output, outStart, outEnd);
-        else
-             return defaultConv.flush(output, outStart, outEnd);
-    }
-
-
-    /**
-     * Character conversion
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        int num = 0;
-
-        charOff = outOff;
-        byteOff = inOff;
-
-        try {
-            if (detectedConv == null) {
-                int euckana = 0;
-                int ss2count = 0;
-                int firstmask = 0;
-                int secondmask = 0;
-                int cnt;
-                boolean nonAsciiFound = false;
-
-                for (cnt = inOff; cnt < inEnd; cnt++) {
-                    firstmask = 0;
-                    secondmask = 0;
-                    int byte1 = input[cnt]&0xff;
-                    int byte2;
-
-                    // TODO: should check valid escape sequences!
-                    if (byte1 == 0x1b) {
-                        convName = "ISO2022JP";
-                        break;
-                    }
-
-                    // Try to convert all leading ASCII characters.
-                    if ((nonAsciiFound == false) && (byte1 < 0x80)) {
-                        if (charOff >= outEnd)
-                            throw new ConversionBufferFullException();
-                        output[charOff++] = (char) byte1;
-                        byteOff++;
-                        num++;
-                        continue;
-                    }
-
-                    // We can no longer convert ASCII.
-                    nonAsciiFound = true;
-
-                    firstmask = maskTable1[byte1];
-                    if (byte1 == SS2)
-                        ss2count++;
-
-                    if (firstmask != 0) {
-                        if (cnt+1 < inEnd) {
-                            byte2 = input[++cnt] & 0xff;
-                            secondmask = maskTable2[byte2];
-                            int mask = firstmask & secondmask;
-                            if (mask == EUCJP_MASK) {
-                                convName = EUCJPName;
-                                break;
-                            }
-                            if ((mask == SJIS2B_MASK) || (mask == SJIS1B_MASK)
-                                || (JISAutoDetect.canBeSJIS1B(firstmask) && secondmask == 0)) {
-                                convName = SJISName;
-                                break;
-                            }
-
-                            // If the first byte is a SS3 and the third byte
-                            // is not an EUC byte, it should be SJIS.
-                            // Otherwise, we can't determine it yet, but it's
-                            // very likely SJIS. So we don't take the EUCJP CS3
-                            // character boundary. If we tried both
-                            // possibilities here, it might be able to be
-                            // determined correctly.
-                            if ((byte1 == SS3) && JISAutoDetect.canBeEUCJP(secondmask)) {
-                                if (cnt+1 < inEnd) {
-                                    int nextbyte = input[cnt+1] & 0xff;
-                                    if (! JISAutoDetect.canBeEUCJP(maskTable2[nextbyte]))
-                                        convName = SJISName;
-                                } else
-                                    convName = SJISName;
-                            }
-                            if (JISAutoDetect.canBeEUCKana(firstmask, secondmask))
-                                euckana++;
-                        } else {
-                            if ((firstmask & SJIS1B_MASK) != 0) {
-                                convName = SJISName;
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                if (nonAsciiFound && (convName == null)) {
-                    if ((euckana > 1) || (ss2count > 1))
-                        convName = EUCJPName;
-                    else
-                        convName = SJISName;
-                }
-
-                if (convName != null) {
-                    try {
-                        detectedConv = ByteToCharConverter.getConverter(convName);
-                        detectedConv.subChars = subChars;
-                        detectedConv.subMode = subMode;
-                    } catch (UnsupportedEncodingException e){
-                        detectedConv = null;
-                        convName = null;
-                    }
-                }
-            }
-        } catch (ConversionBufferFullException bufferFullException) {
-                throw bufferFullException;
-        } catch (Exception e) {
-            // If we fail to detect the converter needed for any reason,
-            // use the default converter.
-            detectedConv = defaultConv;
-        }
-
-        // If we've converted all ASCII characters, then return.
-        if (byteOff == inEnd) {
-            return num;
-        }
-
-        if(detectedConv != null) {
-            try {
-                num += detectedConv.convert(input, inOff + num, inEnd,
-                                            output, outOff + num, outEnd);
-            } finally {
-                charOff = detectedConv.nextCharIndex();
-                byteOff = detectedConv.nextByteIndex();
-                badInputLength = detectedConv.badInputLength;
-            }
-        } else {
-            try {
-                num += defaultConv.convert(input, inOff + num, inEnd,
-                                           output, outOff + num, outEnd);
-            } finally {
-                charOff = defaultConv.nextCharIndex();
-                byteOff = defaultConv.nextByteIndex();
-                badInputLength = defaultConv.badInputLength;
-            }
-        }
-        return num;
-    }
-
-    public void reset() {
-        if(detectedConv != null) {
-             detectedConv.reset();
-             detectedConv = null;
-             convName = null;
-        } else
-             defaultConv.reset();
-        charOff = byteOff = 0;
-    }
-
-    public String getCharacterEncoding() {
-        return "JISAutoDetect";
-    }
-
-    public String toString() {
-        String s = getCharacterEncoding();
-        if (detectedConv != null) {
-            s += "[" + detectedConv.getCharacterEncoding() + "]";
-        } else {
-            s += "[unknown]";
-        }
-        return s;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharJohab.java b/src/share/classes/sun/io/ByteToCharJohab.java
deleted file mode 100644
index aa1c0da..0000000
--- a/src/share/classes/sun/io/ByteToCharJohab.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharJohab extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new Johab().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "Johab";
-    }
-
-    public ByteToCharJohab() {
-        super(dec);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharKOI8_R.java b/src/share/classes/sun/io/ByteToCharKOI8_R.java
deleted file mode 100644
index 877077a..0000000
--- a/src/share/classes/sun/io/ByteToCharKOI8_R.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.KOI8_R;
-
-/**
- * A table to convert KOI8_R to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharKOI8_R extends ByteToCharSingleByte {
-
-    private final static KOI8_R nioCoder = new KOI8_R();
-
-    public String getCharacterEncoding() {
-        return "KOI8_R";
-    }
-
-    public ByteToCharKOI8_R() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMS874.java b/src/share/classes/sun/io/ByteToCharMS874.java
deleted file mode 100644
index 290ecc1..0000000
--- a/src/share/classes/sun/io/ByteToCharMS874.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MS874;
-
-/**
- * A table to convert MS874 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMS874 extends ByteToCharSingleByte {
-
-    private final static MS874 nioCoder = new MS874();
-
-    public String getCharacterEncoding() {
-        return "MS874";
-    }
-
-    public ByteToCharMS874() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMS932.java b/src/share/classes/sun/io/ByteToCharMS932.java
deleted file mode 100644
index 6dcd8f9..0000000
--- a/src/share/classes/sun/io/ByteToCharMS932.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharMS932 extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new MS932().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "MS932";
-    }
-
-    public ByteToCharMS932() {
-        super(dec);
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharMS936.java b/src/share/classes/sun/io/ByteToCharMS936.java
deleted file mode 100644
index 6ad7bbc..0000000
--- a/src/share/classes/sun/io/ByteToCharMS936.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharMS936 extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new MS936().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "MS936";
-    }
-
-    public ByteToCharMS936() {
-        super(dec);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMS949.java b/src/share/classes/sun/io/ByteToCharMS949.java
deleted file mode 100644
index 1506166..0000000
--- a/src/share/classes/sun/io/ByteToCharMS949.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharMS949 extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new MS949().newDecoder();
-
-
-    public String getCharacterEncoding() {
-        return "MS949";
-    }
-
-    public ByteToCharMS949() {
-        super(dec);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMS950.java b/src/share/classes/sun/io/ByteToCharMS950.java
deleted file mode 100644
index 1d6026c..0000000
--- a/src/share/classes/sun/io/ByteToCharMS950.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class ByteToCharMS950 extends ByteToCharDBCS_ASCII {
-
-    private static DoubleByte.Decoder dec =
-        (DoubleByte.Decoder)new MS950().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "MS950";
-    }
-
-    public ByteToCharMS950() {
-        super(dec);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMS950_HKSCS.java b/src/share/classes/sun/io/ByteToCharMS950_HKSCS.java
deleted file mode 100644
index f03b641..0000000
--- a/src/share/classes/sun/io/ByteToCharMS950_HKSCS.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.HKSCS;
-import sun.nio.cs.ext.MS950_HKSCS;
-import static sun.nio.cs.CharsetMapping.*;
-
-public class ByteToCharMS950_HKSCS extends ByteToCharDBCS_ASCII {
-
-    private static HKSCS.Decoder dec =
-        (HKSCS.Decoder)new MS950_HKSCS().newDecoder();
-
-    public String getCharacterEncoding() {
-        return "MS950_HKSCS";
-    }
-
-    public ByteToCharMS950_HKSCS() {
-        super(dec);
-    }
-
-    protected char decodeDouble(int byte1, int byte2) {
-        char c = dec.decodeDouble(byte1, byte2);
-        if (c == UNMAPPABLE_DECODING)
-            c = dec.decodeBig5(byte1, byte2);
-        return c;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacArabic.java b/src/share/classes/sun/io/ByteToCharMacArabic.java
deleted file mode 100644
index f2c69e5..0000000
--- a/src/share/classes/sun/io/ByteToCharMacArabic.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacArabic;
-
-/**
- * A table to convert to MacArabic to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacArabic extends ByteToCharSingleByte {
-
-    private final static MacArabic nioCoder = new MacArabic();
-
-    public String getCharacterEncoding() {
-        return "MacArabic";
-    }
-
-    public ByteToCharMacArabic() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacCentralEurope.java b/src/share/classes/sun/io/ByteToCharMacCentralEurope.java
deleted file mode 100644
index 3b9c02f..0000000
--- a/src/share/classes/sun/io/ByteToCharMacCentralEurope.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacCentralEurope;
-
-/**
- * A table to convert to MacCentralEurope to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacCentralEurope extends ByteToCharSingleByte {
-
-    private final static MacCentralEurope nioCoder = new MacCentralEurope();
-
-    public String getCharacterEncoding() {
-        return "MacCentralEurope";
-    }
-
-    public ByteToCharMacCentralEurope() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacCroatian.java b/src/share/classes/sun/io/ByteToCharMacCroatian.java
deleted file mode 100644
index 5c9202e..0000000
--- a/src/share/classes/sun/io/ByteToCharMacCroatian.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacCroatian;
-
-/**
- * A table to convert to MacCroatian to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacCroatian extends ByteToCharSingleByte {
-
-    private final static MacCroatian nioCoder = new MacCroatian();
-
-    public String getCharacterEncoding() {
-        return "MacCroatian";
-    }
-
-    public ByteToCharMacCroatian() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacCyrillic.java b/src/share/classes/sun/io/ByteToCharMacCyrillic.java
deleted file mode 100644
index 63f66d3..0000000
--- a/src/share/classes/sun/io/ByteToCharMacCyrillic.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacCyrillic;
-
-/**
- * A table to convert to MacCyrillic to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacCyrillic extends ByteToCharSingleByte {
-
-    private final static MacCyrillic nioCoder = new MacCyrillic();
-
-    public String getCharacterEncoding() {
-        return "MacCyrillic";
-    }
-
-    public ByteToCharMacCyrillic() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacDingbat.java b/src/share/classes/sun/io/ByteToCharMacDingbat.java
deleted file mode 100644
index ac04fc0..0000000
--- a/src/share/classes/sun/io/ByteToCharMacDingbat.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacDingbat;
-
-/**
- * A table to convert to MacDingbat to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacDingbat extends ByteToCharSingleByte {
-
-    private final static MacDingbat nioCoder = new MacDingbat();
-
-    public String getCharacterEncoding() {
-        return "MacDingbat";
-    }
-
-    public ByteToCharMacDingbat() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacGreek.java b/src/share/classes/sun/io/ByteToCharMacGreek.java
deleted file mode 100644
index d7274ba..0000000
--- a/src/share/classes/sun/io/ByteToCharMacGreek.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacGreek;
-
-/**
- * A table to convert to MacGreek to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacGreek extends ByteToCharSingleByte {
-
-    private final static MacGreek nioCoder = new MacGreek();
-
-    public String getCharacterEncoding() {
-        return "MacGreek";
-    }
-
-    public ByteToCharMacGreek() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacHebrew.java b/src/share/classes/sun/io/ByteToCharMacHebrew.java
deleted file mode 100644
index 562c165..0000000
--- a/src/share/classes/sun/io/ByteToCharMacHebrew.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacHebrew;
-
-/**
- * A table to convert to MacHebrew to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacHebrew extends ByteToCharSingleByte {
-
-    private final static MacHebrew nioCoder = new MacHebrew();
-
-    public String getCharacterEncoding() {
-        return "MacHebrew";
-    }
-
-    public ByteToCharMacHebrew() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacIceland.java b/src/share/classes/sun/io/ByteToCharMacIceland.java
deleted file mode 100644
index 9322d4c..0000000
--- a/src/share/classes/sun/io/ByteToCharMacIceland.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacIceland;
-
-/**
- * A table to convert to MacIceland to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacIceland extends ByteToCharSingleByte {
-
-    private final static MacIceland nioCoder = new MacIceland();
-
-    public String getCharacterEncoding() {
-        return "MacIceland";
-    }
-
-    public ByteToCharMacIceland() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacRoman.java b/src/share/classes/sun/io/ByteToCharMacRoman.java
deleted file mode 100644
index bb64677..0000000
--- a/src/share/classes/sun/io/ByteToCharMacRoman.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacRoman;
-
-/**
- * A table to convert to MacRoman to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacRoman extends ByteToCharSingleByte {
-
-    private final static MacRoman nioCoder = new MacRoman();
-
-    public String getCharacterEncoding() {
-        return "MacRoman";
-    }
-
-    public ByteToCharMacRoman() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacRomania.java b/src/share/classes/sun/io/ByteToCharMacRomania.java
deleted file mode 100644
index 9567cc1..0000000
--- a/src/share/classes/sun/io/ByteToCharMacRomania.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacRomania;
-
-/**
- * A table to convert to MacRomania to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacRomania extends ByteToCharSingleByte {
-
-    private final static MacRomania nioCoder = new MacRomania();
-
-    public String getCharacterEncoding() {
-        return "MacRomania";
-    }
-
-    public ByteToCharMacRomania() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacSymbol.java b/src/share/classes/sun/io/ByteToCharMacSymbol.java
deleted file mode 100644
index 3a5b7a3..0000000
--- a/src/share/classes/sun/io/ByteToCharMacSymbol.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacSymbol;
-
-/**
- * A table to convert to MacSymbol to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacSymbol extends ByteToCharSingleByte {
-
-    private final static MacSymbol nioCoder = new MacSymbol();
-
-    public String getCharacterEncoding() {
-        return "MacSymbol";
-    }
-
-    public ByteToCharMacSymbol() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacThai.java b/src/share/classes/sun/io/ByteToCharMacThai.java
deleted file mode 100644
index bcef9e8..0000000
--- a/src/share/classes/sun/io/ByteToCharMacThai.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacThai;
-
-/**
- * A table to convert to MacThai to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacThai extends ByteToCharSingleByte {
-
-    private final static MacThai nioCoder = new MacThai();
-
-    public String getCharacterEncoding() {
-        return "MacThai";
-    }
-
-    public ByteToCharMacThai() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacTurkish.java b/src/share/classes/sun/io/ByteToCharMacTurkish.java
deleted file mode 100644
index 7ab11b0..0000000
--- a/src/share/classes/sun/io/ByteToCharMacTurkish.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacTurkish;
-
-/**
- * A table to convert to MacTurkish to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacTurkish extends ByteToCharSingleByte {
-
-    private final static MacTurkish nioCoder = new MacTurkish();
-
-    public String getCharacterEncoding() {
-        return "MacTurkish";
-    }
-
-    public ByteToCharMacTurkish() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharMacUkraine.java b/src/share/classes/sun/io/ByteToCharMacUkraine.java
deleted file mode 100644
index f24d777..0000000
--- a/src/share/classes/sun/io/ByteToCharMacUkraine.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MacUkraine;
-
-/**
- * A table to convert to MacUkraine to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharMacUkraine extends ByteToCharSingleByte {
-
-    private final static MacUkraine nioCoder = new MacUkraine();
-
-    public String getCharacterEncoding() {
-        return "MacUkraine";
-    }
-
-    public ByteToCharMacUkraine() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharPCK.java b/src/share/classes/sun/io/ByteToCharPCK.java
deleted file mode 100644
index 0646f68..0000000
--- a/src/share/classes/sun/io/ByteToCharPCK.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0208_Solaris_Decoder;
-
-/**
- *
- * @author Limin Shi
- * @author Mark Son-Bell
- * @author Ian Little
- *
- *
- * PCK Converter for Solaris ja locales
- * refer to : Solaris manpage man PCK(5)
- * Incorporates mappings from NEC row 13 and IBM select extension chars
- * in addition to those defined within JIS X0208:1997 (bugID: 4765370)
- *
- */
-
-public class ByteToCharPCK extends ByteToCharSJIS {
-    ByteToCharJIS0201 bcJIS0201 = new ByteToCharJIS0201();
-    ByteToCharJIS0208_Solaris bcJIS0208 = new ByteToCharJIS0208_Solaris();
-
-    public String getCharacterEncoding() {
-        return "PCK";
-    }
-
-    protected char convSingleByte(int b) {
-        // If the high bits are all off, it's ASCII == Unicode
-        if ((b & 0xFF80) == 0) {
-            return (char)b;
-        }
-        return bcJIS0201.getUnicode(b);
-    }
-
-    protected char getUnicode(int c1, int c2) {
-        char outChar;
-        if ((outChar = super.getUnicode(c1, c2)) != '\uFFFD') {
-           // Map JIS X 0208:1983 0x213D <--> U+2015
-           return ((outChar != '\u2014')? outChar: '\u2015');
-        } else {
-            int adjust = c2 < 0x9F ? 1 : 0;
-            int rowOffset = c1 < 0xA0 ? 0x70 : 0xB0;
-            int cellOffset = (adjust == 1) ? (c2 > 0x7F ? 0x20 : 0x1F) : 0x7E;
-            int b1 = ((c1 - rowOffset) << 1) - adjust;
-            int b2 = c2 - cellOffset;
-            outChar = bcJIS0208.getUnicode(b1, b2);
-            return outChar;
-        }
-    }
-
-    String prt(int i) {
-        return Integer.toString(i,16);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharSJIS.java b/src/share/classes/sun/io/ByteToCharSJIS.java
deleted file mode 100644
index 79ae211..0000000
--- a/src/share/classes/sun/io/ByteToCharSJIS.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1996, 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * The SJIS converters follow the Shift JIS definition in the JIS
- * X0208:1997 standard as much as possible. The MS932 converters must
- * be used where the Microsoft Code Page 932 character repertoire and
- * Unicode mappings are required.
- *
- * @author Limin Shi
- * @author Mark Son-Bell
- */
-
-public class ByteToCharSJIS extends ByteToCharJIS0208 {
-    ByteToCharJIS0201 bcJIS0201 = new ByteToCharJIS0201();
-
-    public String getCharacterEncoding() {
-        return "SJIS";
-    }
-
-    protected char convSingleByte(int b) {
-        // If the high bits are all off, it's ASCII == Unicode
-        if ((b & 0xFF80) == 0) {
-            return (char)b;
-        }
-        return bcJIS0201.getUnicode(b);
-    }
-
-    protected char getUnicode(int c1, int c2) {
-        int adjust = c2 < 0x9F ? 1 : 0;
-        int rowOffset = c1 < 0xA0 ? 0x70 : 0xB0;
-        int cellOffset = (adjust == 1) ? (c2 > 0x7F ? 0x20 : 0x1F) : 0x7E;
-        int b1 = ((c1 - rowOffset) << 1) - adjust;
-        int b2 = c2 - cellOffset;
-        return super.getUnicode(b1, b2);
-    }
-
-    String prt(int i) {
-        return Integer.toString(i,16);
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharSingleByte.java b/src/share/classes/sun/io/ByteToCharSingleByte.java
deleted file mode 100644
index c271262..0000000
--- a/src/share/classes/sun/io/ByteToCharSingleByte.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * A table driven conversion from byte to char for single byte  character sets.
- * The needed data tables will reside in a character set specific subclass.
- *
- * @author Lloyd Honomichl
- * @author Asmus Freytag
- */
-public abstract class ByteToCharSingleByte extends ByteToCharConverter {
-
-    /**
-     * Mapping table. Values supplied by subclass
-     */
-    protected String byteToCharTable;
-
-    public String getByteToCharTable() {
-        return byteToCharTable;
-    }
-
-    public int flush(char[] output, int outStart, int outEnd) {
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    /**
-     * Converts bytes to characters according to the selected character
-     * encoding.
-     * Maintains internal state, so that conversions that result in
-     * exceptions can be restarted by calling convert again, with
-     * appropriately modified parameters.
-     * Call reset before converting input that is not a continuation of
-     * the previous call.
-     * @return the number of characters written to output.
-     * @param input byte array containing text in character set
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output character array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last character to be written to
-     * @throw MalformedInputException for any sequence of bytes that is
-     * illegal for the input character set, including any partial multi-byte
-     * sequence which occurs at the end of an input buffer.
-     * @throw UnsupportedCharacterException for any sequence of bytes that
-     * contain a character not supported in the current conversion.
-     * @throw BufferFullException whenever the output buffer is full
-     * before the input is exhausted.
-     * @see #reset
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws UnknownCharacterException,
-               MalformedInputException,
-               ConversionBufferFullException
-    {
-        char    outputChar;
-        int     byteIndex;
-
-        charOff = outOff;
-        byteOff = inOff;
-
-        // Loop until we hit the end of the input
-        while(byteOff < inEnd) {
-
-            byteIndex = input[byteOff];
-
-            /* old source
-             *outputChar = byteToCharTable[input[byteOff] + 128];
-             */
-            // Lookup the output character
-            outputChar = getUnicode(byteIndex);
-
-            // Is the output unmappable?
-            if (outputChar == '\uFFFD') {
-                if (subMode) {
-                    outputChar = subChars[0];
-                } else {
-                    badInputLength = 1;
-                    throw new UnknownCharacterException();
-                }
-            }
-
-            // If we don't have room for the output, throw an exception
-            if (charOff >= outEnd)
-                throw new ConversionBufferFullException();
-
-            // Put the character in the output buffer
-            output[charOff]= outputChar;
-            charOff++;
-            byteOff++;
-        }
-
-        // Return the length written to the output buffer
-        return charOff-outOff;
-    }
-
-    protected char getUnicode(int byteIndex) {
-        int n = byteIndex + 128;
-        if (n >= byteToCharTable.length() || n < 0)
-            return '\uFFFD';
-        return byteToCharTable.charAt(n);
-    }
-
-    /**
-     *  Resets the converter.
-     *  Call this method to reset the converter to its initial state
-     */
-    public void reset() {
-        byteOff = charOff = 0;
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharTIS620.java b/src/share/classes/sun/io/ByteToCharTIS620.java
deleted file mode 100644
index 7826b5b..0000000
--- a/src/share/classes/sun/io/ByteToCharTIS620.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.TIS_620;
-
-/**
- * A table to convert TIS620 to Unicode
- *
- * @author  ConverterGenerator tool
- */
-
-public class ByteToCharTIS620 extends ByteToCharSingleByte {
-
-    private final static TIS_620 nioCoder = new TIS_620();
-
-    public String getCharacterEncoding() {
-        return "TIS620";
-    }
-
-    public ByteToCharTIS620() {
-        super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharUTF16.java b/src/share/classes/sun/io/ByteToCharUTF16.java
deleted file mode 100644
index ae5616b..0000000
--- a/src/share/classes/sun/io/ByteToCharUTF16.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-
-/**
- * Convert byte arrays containing Unicode characters into arrays of actual
- * Unicode characters, assuming an initial byte-order mark.
- */
-
-public class ByteToCharUTF16 extends ByteToCharUnicode {
-
-    public ByteToCharUTF16() {
-        super(AUTO, true);
-    }
-
-    public String getCharacterEncoding() {
-        return "UTF-16";
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharUTF8.java b/src/share/classes/sun/io/ByteToCharUTF8.java
deleted file mode 100644
index 3abe593..0000000
--- a/src/share/classes/sun/io/ByteToCharUTF8.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-
-/**
- * UCS Transformation Format 8 (UTF-8) -> UCS2 (UTF16) converter
- *
- * see CharToByteUTF8.java about UTF-8 format
- */
-
-public class ByteToCharUTF8 extends ByteToCharConverter {
-
-    private int savedSize;
-    private byte[] savedBytes;
-
-    public ByteToCharUTF8() {
-        super();
-        savedSize = 0;
-        savedBytes = new byte[5];
-    }
-
-    public int flush(char[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (savedSize != 0) {
-            savedSize = 0;
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    /**
-     * Character converson
-     */
-    public int convert(byte[] input, int inOff, int inEnd,
-                       char[] output, int outOff, int outEnd)
-        throws MalformedInputException, ConversionBufferFullException
-    {
-        int byte1, byte2, byte3, byte4;
-        char[] outputChar = new char[2];
-        int outputSize;
-        int byteOffAdjustment = 0;
-
-        if (savedSize != 0) {
-            byte[] newBuf;
-            newBuf = new byte[inEnd - inOff + savedSize];
-            for (int i = 0; i < savedSize; i++) {
-                newBuf[i] = savedBytes[i];
-            }
-            System.arraycopy(input, inOff, newBuf, savedSize, inEnd - inOff);
-            input = newBuf;
-            inOff = 0;
-            inEnd = newBuf.length;
-            byteOffAdjustment = -savedSize;
-            savedSize = 0;
-        }
-
-        charOff = outOff;
-        byteOff = inOff;
-        int startByteOff;
-
-        while(byteOff < inEnd) {
-
-            startByteOff = byteOff;
-            byte1 = input[byteOff++] & 0xff;
-
-            if ((byte1 & 0x80) == 0){
-                outputChar[0] = (char)byte1;
-                outputSize = 1;
-            } else if ((byte1 & 0xe0) == 0xc0) {
-                if (byteOff >= inEnd) {
-                    savedSize = 1;
-                    savedBytes[0] = (byte)byte1;
-                    break;
-                }
-                byte2 = input[byteOff++] & 0xff;
-                if ((byte2 & 0xc0) != 0x80) {
-                    badInputLength = 2;
-                    byteOff += byteOffAdjustment;
-                    throw new MalformedInputException();
-                }
-                outputChar[0] = (char)(((byte1 & 0x1f) << 6) | (byte2 & 0x3f));
-                outputSize = 1;
-            } else if ((byte1 & 0xf0) == 0xe0){
-                if (byteOff + 1 >= inEnd) {
-                        savedBytes[0] = (byte)byte1;
-                    if (byteOff >= inEnd) {
-                        savedSize = 1;
-                    } else {
-                        savedSize = 2;
-                        savedBytes[1] = input[byteOff++];
-                    }
-                    break;
-                }
-                byte2 = input[byteOff++] & 0xff;
-                byte3 = input[byteOff++] & 0xff;
-                if ((byte2 & 0xc0) != 0x80 || (byte3 & 0xc0) != 0x80) {
-                    badInputLength = 3;
-                    byteOff += byteOffAdjustment;
-                    throw new MalformedInputException();
-                }
-                outputChar[0] = (char)(((byte1 & 0x0f) << 12)
-                                       | ((byte2 & 0x3f) << 6)
-                                       | (byte3 & 0x3f));
-                outputSize = 1;
-            } else if ((byte1 & 0xf8) == 0xf0) {
-                if (byteOff + 2 >= inEnd) {
-                    savedBytes[0] = (byte)byte1;
-                    if (byteOff >= inEnd) {
-                        savedSize = 1;
-                    } else if (byteOff + 1 >= inEnd) {
-                        savedSize = 2;
-                        savedBytes[1] = input[byteOff++];
-                    } else {
-                        savedSize = 3;
-                        savedBytes[1] = input[byteOff++];
-                        savedBytes[2] = input[byteOff++];
-                    }
-                    break;
-                }
-                byte2 = input[byteOff++] & 0xff;
-                byte3 = input[byteOff++] & 0xff;
-                byte4 = input[byteOff++] & 0xff;
-                if ((byte2 & 0xc0) != 0x80 ||
-                    (byte3 & 0xc0) != 0x80 ||
-                    (byte4 & 0xc0) != 0x80) {
-                    badInputLength = 4;
-                    byteOff += byteOffAdjustment;
-                    throw new MalformedInputException();
-                }
-                // this byte sequence is UTF16 character
-                int ucs4 = (0x07 & byte1) << 18 |
-                           (0x3f & byte2) << 12 |
-                           (0x3f & byte3) <<  6 |
-                           (0x3f & byte4);
-                outputChar[0] = (char)((ucs4 - 0x10000) / 0x400 + 0xd800);
-                outputChar[1] = (char)((ucs4 - 0x10000) % 0x400 + 0xdc00);
-                outputSize = 2;
-            } else {
-                badInputLength = 1;
-                byteOff += byteOffAdjustment;
-                throw new MalformedInputException();
-            }
-
-            if (charOff + outputSize > outEnd) {
-                byteOff = startByteOff;
-                byteOff += byteOffAdjustment;
-                throw new ConversionBufferFullException();
-            }
-
-            for (int i = 0; i < outputSize; i++) {
-                output[charOff + i] = outputChar[i];
-            }
-            charOff += outputSize;
-        }
-
-        byteOff += byteOffAdjustment;
-        return charOff - outOff;
-    }
-
-    /*
-     * Return the character set id
-     */
-    public String getCharacterEncoding() {
-        return "UTF8";
-    }
-
-    /*
-     *   Reset after finding bad input
-     */
-    public void reset() {
-        byteOff = charOff = 0;
-        savedSize = 0;
-    }
-}
diff --git a/src/share/classes/sun/io/ByteToCharUnicode.java b/src/share/classes/sun/io/ByteToCharUnicode.java
deleted file mode 100644
index 083cf99..0000000
--- a/src/share/classes/sun/io/ByteToCharUnicode.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-import java.io.*;
-
-
-/**
- * Convert byte arrays containing Unicode characters into arrays of actual
- * Unicode characters.  This class may be used directly, in which case it
- * expects the input byte array to begin with a byte-order mark, or it may be
- * subclassed in order to preset the byte order and mark behavior.
- *
- * <p> Whether or not a mark is expected, if a mark that does not match the
- * established byte order is later discovered then a
- * <tt>MalformedInputException</tt> will be thrown by the <tt>convert</tt>
- * method.  If a correct mark is seen later in the input stream, it is passed
- * through as a character.
- *
- * @see ByteToCharUnicodeLittle
- * @see ByteToCharUnicodeLittleUnmarked
- * @see ByteToCharUnicodeBig
- * @see ByteToCharUnicodeBigUnmarked
- *
- * @author      Mark Reinhold
- */
-
-public class ByteToCharUnicode extends ByteToCharConverter {
-
-    static final char BYTE_ORDER_MARK = (char) 0xfeff;
-    static final char REVERSED_MARK = (char) 0xfffe;
-
-    static final int AUTO = 0;
-    static final int BIG = 1;
-    static final int LITTLE = 2;
-
-    int originalByteOrder;      /* Byte order specified at creation */
-    int byteOrder;              /* Byte order in use */
-    boolean usesMark;           /* Look for a mark and interpret it */
-
-    /**
-     * Creates a Unicode byte-to-char converter that expects the first pair of
-     * input bytes to be a byte-order mark, which will be interpreted and
-     * discarded.  If the first pair of bytes is not such a mark then a
-     * <tt>MalformedInputException</tt> will be thrown by the convert method.
-     */
-    public ByteToCharUnicode() {
-        originalByteOrder = byteOrder = AUTO;
-        usesMark = true;
-    }
-
-    /**
-     * Creates a Unicode byte-to-char converter that uses the given byte order
-     * and may or may not insist upon an initial byte-order mark.
-     */
-    protected ByteToCharUnicode(int bo, boolean m) {
-        originalByteOrder = byteOrder = bo;
-        usesMark = m;
-    }
-
-    public String getCharacterEncoding() {
-        switch (originalByteOrder) {
-        case BIG:
-            return usesMark ? "UnicodeBig" : "UnicodeBigUnmarked";
-        case LITTLE:
-            return usesMark ? "UnicodeLittle" : "UnicodeLittleUnmarked";
-        default:
-            return "Unicode";
-        }
-    }
-
-    boolean started = false;
-    int leftOverByte;
-    boolean leftOver = false;
-
-    public int convert(byte[] in, int inOff, int inEnd,
-                       char[] out, int outOff, int outEnd)
-        throws ConversionBufferFullException, MalformedInputException
-    {
-        byteOff = inOff;
-        charOff = outOff;
-
-        if (inOff >= inEnd)
-            return 0;
-
-        int b1, b2;
-        int bc = 0;
-        int inI = inOff, outI = outOff;
-
-        if (leftOver) {
-            b1 = leftOverByte & 0xff;
-            leftOver = false;
-        }
-        else {
-            b1 = in[inI++] & 0xff;
-        }
-        bc = 1;
-
-        if (usesMark && !started) {     /* Read initial byte-order mark */
-            if (inI < inEnd) {
-                b2 = in[inI++] & 0xff;
-                bc = 2;
-
-                char c = (char) ((b1 << 8) | b2);
-                int bo = AUTO;
-
-                if (c == BYTE_ORDER_MARK)
-                    bo = BIG;
-                else if (c == REVERSED_MARK)
-                    bo = LITTLE;
-
-                if (byteOrder == AUTO) {
-                    if (bo == AUTO) {
-                        badInputLength = bc;
-                        throw new
-                            MalformedInputException("Missing byte-order mark");
-                    }
-                    byteOrder = bo;
-                    if (inI < inEnd) {
-                        b1 = in[inI++] & 0xff;
-                        bc = 1;
-                    }
-                }
-                else if (bo == AUTO) {
-                    inI--;
-                    bc = 1;
-                }
-                else if (byteOrder == bo) {
-                    if (inI < inEnd) {
-                        b1 = in[inI++] & 0xff;
-                        bc = 1;
-                    }
-                }
-                else {
-                    badInputLength = bc;
-                    throw new
-                        MalformedInputException("Incorrect byte-order mark");
-                }
-
-                started = true;
-            }
-        }
-
-        /* Loop invariant: (b1 contains the next input byte) && (bc == 1) */
-        while (inI < inEnd) {
-            b2 = in[inI++] & 0xff;
-            bc = 2;
-
-            char c;
-            if (byteOrder == BIG)
-                c = (char) ((b1 << 8) | b2);
-            else
-                c = (char) ((b2 << 8) | b1);
-
-            if (c == REVERSED_MARK)
-                throw new
-                    MalformedInputException("Reversed byte-order mark");
-
-            if (outI >= outEnd)
-                throw new ConversionBufferFullException();
-            out[outI++] = c;
-            byteOff = inI;
-            charOff = outI;
-
-            if (inI < inEnd) {
-                b1 = in[inI++] & 0xff;
-                bc = 1;
-            }
-        }
-
-        if (bc == 1) {
-            leftOverByte = b1;
-            byteOff = inI;
-            leftOver = true;
-        }
-
-        return outI - outOff;
-    }
-
-    public void reset() {
-        leftOver = false;
-        byteOff = charOff = 0;
-        started = false;
-        byteOrder = originalByteOrder;
-    }
-
-    public int flush(char buf[], int off, int len)
-        throws MalformedInputException
-    {
-        if (leftOver) {
-            reset();
-            throw new MalformedInputException();
-        }
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharUnicodeBig.java b/src/share/classes/sun/io/ByteToCharUnicodeBig.java
deleted file mode 100644
index 40ccbed..0000000
--- a/src/share/classes/sun/io/ByteToCharUnicodeBig.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-import java.io.*;
-
-
-/**
- * Convert byte arrays containing Unicode characters into arrays of actual
- * Unicode characters, assuming a big-endian byte order.
- *
- * @author      Mark Reinhold
- */
-
-public class ByteToCharUnicodeBig extends ByteToCharUnicode {
-
-    public ByteToCharUnicodeBig() {
-        super(BIG, true);
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharUnicodeBigUnmarked.java b/src/share/classes/sun/io/ByteToCharUnicodeBigUnmarked.java
deleted file mode 100644
index 01a1a8f..0000000
--- a/src/share/classes/sun/io/ByteToCharUnicodeBigUnmarked.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-import java.io.*;
-
-
-/**
- * Convert byte arrays containing Unicode characters into arrays of actual
- * Unicode characters, assuming a big-endian byte order and requiring no
- * byte-order mark.
- *
- * @author      Mark Reinhold
- */
-
-public class ByteToCharUnicodeBigUnmarked extends ByteToCharUnicode {
-
-    public ByteToCharUnicodeBigUnmarked() {
-        super(BIG, false);
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharUnicodeLittle.java b/src/share/classes/sun/io/ByteToCharUnicodeLittle.java
deleted file mode 100644
index cc5a158..0000000
--- a/src/share/classes/sun/io/ByteToCharUnicodeLittle.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-import java.io.*;
-
-
-/**
- * Convert byte arrays containing Unicode characters into arrays of actual
- * Unicode characters, assuming a little-endian byte order.
- *
- * @author      Mark Reinhold
- */
-
-public class ByteToCharUnicodeLittle extends ByteToCharUnicode {
-
-    public ByteToCharUnicodeLittle() {
-        super(LITTLE, true);
-    }
-
-}
diff --git a/src/share/classes/sun/io/ByteToCharUnicodeLittleUnmarked.java b/src/share/classes/sun/io/ByteToCharUnicodeLittleUnmarked.java
deleted file mode 100644
index f77eb83..0000000
--- a/src/share/classes/sun/io/ByteToCharUnicodeLittleUnmarked.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-import java.io.*;
-
-
-/**
- * Convert byte arrays containing Unicode characters into arrays of actual
- * Unicode characters, assuming a little-endian byte order and requiring no
- * byte-order mark.
- *
- * @author      Mark Reinhold
- */
-
-public class ByteToCharUnicodeLittleUnmarked extends ByteToCharUnicode {
-
-    public ByteToCharUnicodeLittleUnmarked() {
-        super(LITTLE, false);
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteASCII.java b/src/share/classes/sun/io/CharToByteASCII.java
deleted file mode 100644
index 51895be..0000000
--- a/src/share/classes/sun/io/CharToByteASCII.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-public class CharToByteASCII extends CharToByteConverter {
-
-    // Return the character set ID
-    public String getCharacterEncoding()
-    {
-        return "ASCII";
-    }
-
-    private char highHalfZoneCode;
-
-    public int flush(byte[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (highHalfZoneCode != 0) {
-            highHalfZoneCode = 0;
-            throw new MalformedInputException
-                ("String ends with <High Half Zone code> of UTF16");
-        }
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    /*
-    * Character conversion
-    */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws MalformedInputException,
-               UnknownCharacterException,
-               ConversionBufferFullException
-    {
-        char    inputChar;          // Input character to be converted
-        byte[]  outputByte;         // Output byte written to output
-        byte[]  tmpArray = new byte[1];
-        int     inputSize;          // Size of input
-        int     outputSize;         // Size of output
-
-        // Record beginning offsets
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (highHalfZoneCode != 0) {
-            inputChar = highHalfZoneCode;
-            highHalfZoneCode = 0;
-            if (input[inOff] >= 0xdc00 && input[inOff] <= 0xdfff) {
-                // This is legal UTF16 sequence.
-                badInputLength = 1;
-                throw new UnknownCharacterException();
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException
-                    ("Previous converted string ends with " +
-                     "<High Half Zone Code> of UTF16 " +
-                     ", but this string is not begin with <Low Half Zone>");
-            }
-        }
-
-        // Loop until we hit the end of the input
-        while(charOff < inEnd) {
-            outputByte = tmpArray;
-
-            // Get the input character
-            inputChar = input[charOff];
-
-            // default outputSize
-            outputSize = 1;
-
-            // Assume this is a simple character
-            inputSize = 1;
-
-            // Is this a high surrogate?
-            if(inputChar >= '\uD800' && inputChar <= '\uDBFF') {
-                // Is this the last character in the input?
-                if (charOff + 1 == inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-
-                // Is there a low surrogate following?
-                inputChar = input[charOff + 1];
-                if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                    // We have a valid surrogate pair.  Too bad we don't map
-                    //  surrogates.  Is substitution enabled?
-                    if (subMode) {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                        inputSize = 2;
-                    } else {
-                        badInputLength = 2;
-                        throw new UnknownCharacterException();
-                    }
-                } else {
-                    // We have a malformed surrogate pair
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-            // Is this an unaccompanied low surrogate?
-            else if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            }
-            // Not part of a surrogate, so try to convert
-            else {
-                // Is this character mappable?
-                if (inputChar <= '\u007F') {
-                    outputByte[0] = (byte)inputChar;
-                } else {
-                    // Is substitution enabled?
-                    if (subMode) {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                    } else {
-                        badInputLength = 1;
-                        throw new UnknownCharacterException();
-                    }
-                }
-            }
-
-            // If we don't have room for the output, throw an exception
-            if (byteOff + outputSize > outEnd)
-                throw new ConversionBufferFullException();
-
-            // Put the byte in the output buffer
-            for (int i = 0; i < outputSize; i++) {
-                output[byteOff++] = outputByte[i];
-            }
-            charOff += inputSize;
-        }
-
-        // Return the length written to the output buffer
-        return byteOff-outOff;
-    }
-
-    // Determine if a character is mappable or not
-    public boolean canConvert(char ch)
-    {
-        return (ch <= '\u007F');
-    }
-
-    // Reset the converter
-    public void reset()
-    {
-        byteOff = charOff = 0;
-        highHalfZoneCode = 0;
-    }
-
-    /**
-     * returns the maximum number of bytes needed to convert a char
-     */
-    public int getMaxBytesPerChar()
-    {
-        return 1;
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteBig5.java b/src/share/classes/sun/io/CharToByteBig5.java
deleted file mode 100644
index c6ef3e4..0000000
--- a/src/share/classes/sun/io/CharToByteBig5.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import sun.nio.cs.ext.Big5;
-
-/**
- * Tables and data to convert Unicode to Big5
- *
- */
-
-public class CharToByteBig5 extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new Big5().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "Big5";
-    }
-
-    public CharToByteBig5() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteBig5_HKSCS.java b/src/share/classes/sun/io/CharToByteBig5_HKSCS.java
deleted file mode 100644
index 706e905..0000000
--- a/src/share/classes/sun/io/CharToByteBig5_HKSCS.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import sun.nio.cs.ext.Big5_HKSCS;
-
-public class CharToByteBig5_HKSCS extends CharToByteDBCS_ASCII {
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new Big5_HKSCS().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "Big5_HKSCS";
-    }
-
-    public CharToByteBig5_HKSCS() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteBig5_Solaris.java b/src/share/classes/sun/io/CharToByteBig5_Solaris.java
deleted file mode 100644
index 503d7b2..0000000
--- a/src/share/classes/sun/io/CharToByteBig5_Solaris.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import sun.nio.cs.ext.Big5_Solaris;
-
-public class CharToByteBig5_Solaris extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new Big5_Solaris().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "Big5_Solaris";
-    }
-
-    public CharToByteBig5_Solaris() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteConverter.java b/src/share/classes/sun/io/CharToByteConverter.java
deleted file mode 100644
index 2a8a9b7..0000000
--- a/src/share/classes/sun/io/CharToByteConverter.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import java.io.*;
-
-
-/**
- * An abstract base class for subclasses which convert Unicode
- * characters into an external encoding.
- *
- * @author Asmus Freytag
- * @author Lloyd Honomichl, Novell, Inc.
- *
- * @deprecated Replaced by {@link java.nio.charset}.  THIS API WILL BE
- * REMOVED IN J2SE 1.6.
- */
-@Deprecated
-public abstract class CharToByteConverter {
-
-    /**
-     * Substitution mode flag.
-     */
-    protected boolean subMode = true;
-
-    /**
-     * Bytes to substitute for unmappable input.
-     */
-    protected byte[] subBytes = { (byte)'?' };
-
-    /**
-     * Offset of next character to be converted.
-     */
-    protected int charOff;
-
-    /**
-     * Offset of next byte to be output.
-     */
-    protected int byteOff;
-
-    /**
-     * Length of bad input that caused conversion to stop.
-     */
-    protected int badInputLength;
-
-    /**
-     * Create an instance of the default CharToByteConverter subclass.
-     */
-    public static CharToByteConverter getDefault() {
-        Object cvt;
-        cvt = Converters.newDefaultConverter(Converters.CHAR_TO_BYTE);
-        return (CharToByteConverter)cvt;
-    }
-
-    /**
-     * Returns appropriate CharToByteConverter subclass instance.
-     * @param string represets encoding
-     */
-    public static CharToByteConverter getConverter(String encoding)
-        throws UnsupportedEncodingException
-    {
-        Object cvt;
-        cvt = Converters.newConverter(Converters.CHAR_TO_BYTE, encoding);
-        return (CharToByteConverter)cvt;
-    }
-
-    /**
-     * Returns the character set id for the conversion.
-     */
-    public abstract String getCharacterEncoding();
-
-    /**
-     * Converts an array of Unicode characters into an array of bytes
-     * in the target character encoding.  This method allows a buffer by
-     * buffer conversion of a data stream.  The state of the conversion is
-     * saved between calls to convert.  If a call to convert results in
-     * an exception, the conversion may be continued by calling convert again
-     * with suitably modified parameters.  All conversions should be finished
-     * with a call to the flush method.
-     *
-     * @return the number of bytes written to output.
-     * @param input array containing Unicode characters to be converted.
-     * @param inStart begin conversion at this offset in input array.
-     * @param inEnd stop conversion at this offset in input array (exclusive).
-     * @param output byte array to receive conversion result.
-     * @param outStart start writing to output array at this offset.
-     * @param outEnd stop writing to output array at this offset (exclusive).
-     * @exception MalformedInputException if the input buffer contains any
-     * sequence of chars that is illegal in Unicode (principally unpaired
-     * surrogates and \uFFFF or \uFFFE). After this exception is thrown,
-     * the method nextCharIndex can be called to obtain the index of the
-     * first invalid input character.  The MalformedInputException can
-     * be queried for the length of the invalid input.
-     * @exception UnknownCharacterException for any character that
-     * that cannot be converted to the external character encoding. Thrown
-     * only when converter is not in substitution mode.
-     * @exception ConversionBufferFullException if output array is filled prior
-     * to converting all the input.
-     */
-    public abstract int convert(char[] input, int inStart, int inEnd,
-                                byte[] output, int outStart, int outEnd)
-        throws MalformedInputException,
-               UnknownCharacterException,
-               ConversionBufferFullException;
-
-    /*
-     * Converts any array of characters, including malformed surrogate
-     * pairs, into an array of bytes in the target character encoding.
-     * A precondition is that substitution mode is turned on. This method
-     * allows a buffer by buffer conversion of a data stream.
-     * The state of the conversion is saved between calls to convert.
-     * All conversions should be finished with a call to the flushAny method.
-     *
-     * @return the number of bytes written to output.
-     * @param input array containing Unicode characters to be converted.
-     * @param inStart begin conversion at this offset in input array.
-     * @param inEnd stop conversion at this offset in input array (exclusive).
-     * @param output byte array to receive conversion result.
-     * @param outStart start writing to output array at this offset.
-     * @param outEnd stop writing to output array at this offset (exclusive).
-     * @exception ConversionBufferFullException if output array is filled prior
-     * to converting all the input.
-     */
-    public int convertAny(char[] input, int inStart, int inEnd,
-                          byte[] output, int outStart, int outEnd)
-        throws ConversionBufferFullException
-    {
-        if (!subMode) {             /* Precondition: subMode == true */
-            throw new IllegalStateException("Substitution mode is not on");
-        }
-        /* Rely on the untested precondition that the indices are meaningful */
-        /* For safety, use the public interface to charOff and byteOff, but
-           badInputLength is directly modified.*/
-        int localInOff = inStart;
-        int localOutOff = outStart;
-        while(localInOff < inEnd) {
-            try {
-                int discard = convert(input, localInOff, inEnd,
-                                      output, localOutOff, outEnd);
-                return (nextByteIndex() - outStart);
-            } catch (MalformedInputException e) {
-                byte[] s = subBytes;
-                int subSize = s.length;
-                localOutOff = nextByteIndex();
-                if ((localOutOff + subSize) > outEnd)
-                    throw new ConversionBufferFullException();
-                for (int i = 0; i < subSize; i++)
-                    output[localOutOff++] = s[i];
-                localInOff = nextCharIndex();
-                localInOff += badInputLength;
-                badInputLength = 0;
-                if (localInOff >= inEnd){
-                    byteOff = localOutOff;
-                    return (byteOff - outStart);
-                }
-                continue;
-            }catch (UnknownCharacterException e) {
-                /* Should never occur, since subMode == true */
-                throw new Error("UnknownCharacterException thrown "
-                                + "in substititution mode",
-                                e);
-            }
-        }
-        return (nextByteIndex() - outStart);
-    }
-
-
-
-    /**
-     * Converts an array of Unicode characters into an array of bytes
-     * in the target character encoding.  Unlike convert, this method
-     * does not do incremental conversion.  It assumes that the given
-     * input array contains all the characters to be converted. The
-     * state of the converter is reset at the beginning of this method
-     * and is left in the reset state on successful termination.
-     * The converter is not reset if an exception is thrown.
-     * This allows the caller to determine where the bad input
-     * was encountered by calling nextCharIndex.
-     * <p>
-     * This method uses substitution mode when performing the conversion.
-     * The method setSubstitutionBytes may be used to determine what
-     * bytes are substituted.  Even though substitution mode is used,
-     * the state of the converter's substitution mode is not changed
-     * at the end of this method.
-     *
-     * @return an array of bytes containing the converted characters.
-     * @param input array containing Unicode characters to be converted.
-     * @exception MalformedInputException if the input buffer contains any
-     * sequence of chars that is illegal in Unicode (principally unpaired
-     * surrogates and \uFFFF or \uFFFE). After this exception is thrown,
-     * the method nextCharIndex can be called to obtain the index of the
-     * first invalid input character and getBadInputLength can be called
-     * to determine the length of the invalid input.
-     *
-     * @see   #nextCharIndex
-     * @see   #setSubstitutionMode
-     * @see   #setSubstitutionBytes
-     * @see   #getBadInputLength
-     */
-    public byte[] convertAll( char input[] ) throws MalformedInputException {
-        reset();
-        boolean savedSubMode = subMode;
-        subMode = true;
-
-        byte[] output = new byte[ getMaxBytesPerChar() * input.length ];
-
-        try {
-            int outputLength = convert( input, 0, input.length,
-                                        output, 0, output.length );
-            outputLength += flush( output, nextByteIndex(), output.length );
-
-            byte [] returnedOutput = new byte[ outputLength ];
-            System.arraycopy( output, 0, returnedOutput, 0, outputLength );
-            return returnedOutput;
-        }
-        catch( ConversionBufferFullException e ) {
-            //Not supposed to happen.  If it does, getMaxBytesPerChar() lied.
-            throw new
-                InternalError("this.getMaxBytesPerChar returned bad value");
-        }
-        catch( UnknownCharacterException e ) {
-            // Not supposed to happen since we're in substitution mode.
-            throw new InternalError();
-        }
-        finally {
-            subMode = savedSubMode;
-        }
-    }
-
-    /**
-     * Writes any remaining output to the output buffer and resets the
-     * converter to its initial state.
-     *
-     * @param output byte array to receive flushed output.
-     * @param outStart start writing to output array at this offset.
-     * @param outEnd stop writing to output array at this offset (exclusive).
-     * @exception MalformedInputException if the output to be flushed contained
-     * a partial or invalid multibyte character sequence.  Will occur if the
-     * input buffer on the last call to convert ended with the first character
-     * of a surrogate pair. flush will write what it can to the output buffer
-     * and reset the converter before throwing this exception.  An additional
-     * call to flush is not required.
-     * @exception ConversionBufferFullException if output array is filled
-     * before all the output can be flushed. flush will write what it can
-     * to the output buffer and remember its state.  An additional call to
-     * flush with a new output buffer will conclude the operation.
-     */
-    public abstract int flush( byte[] output, int outStart, int outEnd )
-        throws MalformedInputException, ConversionBufferFullException;
-
-    /**
-     * Writes any remaining output to the output buffer and resets the
-     * converter to its initial state. May only be called when substitution
-     * mode is turned on, and never complains about malformed input (always
-     * substitutes).
-     *
-     * @param output byte array to receive flushed output.
-     * @param outStart start writing to output array at this offset.
-     * @param outEnd stop writing to output array at this offset (exclusive).
-     * @return number of bytes writter into output.
-     * @exception ConversionBufferFullException if output array is filled
-     * before all the output can be flushed. flush will write what it can
-     * to the output buffer and remember its state.  An additional call to
-     * flush with a new output buffer will conclude the operation.
-     */
-    public int flushAny( byte[] output, int outStart, int outEnd )
-        throws ConversionBufferFullException
-    {
-        if (!subMode) {             /* Precondition: subMode == true */
-            throw new IllegalStateException("Substitution mode is not on");
-        }
-        try {
-            return flush(output, outStart, outEnd);
-        } catch (MalformedInputException e) {
-            /* Assume that if a malformed input exception has occurred,
-               no useful data has been placed in the output buffer.
-               i.e. there is no mixture of left over good + some bad data.
-               Usually occurs with a trailing high surrogate pair element.
-               Special cases occur in Cp970, 949c and 933 that seem
-               to be covered, but may require further investigation */
-            int subSize = subBytes.length;
-            byte[] s = subBytes;
-            int outIndex = outStart;
-            if ((outStart + subSize) > outEnd)
-                throw new ConversionBufferFullException();
-            for (int i = 0; i < subSize; i++)
-                output[outIndex++] = s[i];
-            byteOff = charOff = 0; // Reset the internal state.
-            badInputLength = 0;
-            return subSize;
-        }
-    }
-
-    /**
-     * Resets converter to its initial state.
-     */
-    public abstract void reset();
-
-    /**
-     * Returns true if the given character can be converted to the
-     * target character encoding.
-     * @return true if given character is translatable, false otherwise.
-     * @param c character to test
-     */
-    public boolean canConvert(char c) {
-        try {
-            //FIXME output buffer size should use getMaxBytesPerChar value.
-            char[] input = new char[1];
-            byte[] output = new byte[3];
-            input[0] = c;
-            convert(input, 0, 1, output, 0, 3);
-            return true;
-        } catch(CharConversionException e){
-            return false;
-        }
-    }
-
-    /**
-     * Returns the maximum number of bytes needed to convert a char. Useful
-     * for calculating the maximum output buffer size needed for a particular
-     * input buffer.
-     */
-    public abstract int getMaxBytesPerChar();
-
-    /**
-     * Returns the length, in chars, of the input which caused a
-     * MalformedInputException.  Always refers to the last
-     * MalformedInputException thrown by the converter.  If none have
-     * ever been thrown, returns 0.
-     */
-    public int getBadInputLength() {
-        return badInputLength;
-    }
-
-    /**
-     * Returns the index of the character just past
-     * the last character successfully converted by the previous call
-     * to convert.
-     */
-    public int nextCharIndex() {
-        return charOff;
-    }
-
-    /**
-     * Returns the index of the byte just past the last byte written by
-     * the previous call to convert.
-     */
-    public int nextByteIndex() {
-        return byteOff;
-    }
-
-    /**
-     * Sets converter into substitution mode.  In substitution mode,
-     * the converter will replace untranslatable characters in the source
-     * encoding with the substitution character set by setSubstitutionBytes.
-     * When not in substitution mode, the converter will throw an
-     * UnknownCharacterException when it encounters untranslatable input.
-     *
-     * @param doSub if true, enable substitution mode.
-     * @see #setSubstitutionBytes
-     */
-    public void setSubstitutionMode(boolean doSub) {
-        subMode = doSub;
-    }
-
-    /**
-     * Sets the substitution bytes to use when the converter is in
-     * substitution mode.  The given bytes should represent a valid
-     * character in the target character encoding and must not be
-     * longer than the value returned by getMaxBytesPerChar for this
-     * converter.
-     *
-     * @param newSubBytes the substitution bytes
-     * @exception IllegalArgumentException if given byte array is longer than
-     *    the value returned by the method getMaxBytesPerChar.
-     * @see #setSubstitutionMode
-     * @see #getMaxBytesPerChar
-     */
-    public void setSubstitutionBytes( byte[] newSubBytes )
-        throws IllegalArgumentException
-    {
-        if( newSubBytes.length > getMaxBytesPerChar() ) {
-            throw new IllegalArgumentException();
-        }
-
-        subBytes = new byte[ newSubBytes.length ];
-        System.arraycopy( newSubBytes, 0, subBytes, 0, newSubBytes.length );
-    }
-
-    /**
-     * Returns a string representation of the class.
-     */
-    public String toString() {
-        return "CharToByteConverter: " + getCharacterEncoding();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp037.java b/src/share/classes/sun/io/CharToByteCp037.java
deleted file mode 100644
index 91a8bf6..0000000
--- a/src/share/classes/sun/io/CharToByteCp037.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM037;
-
-/**
- * Tables and data to convert Unicode to Cp037
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp037 extends CharToByteSingleByte {
-
-    private final static IBM037 nioCoder = new IBM037();
-
-    public String getCharacterEncoding() {
-        return "Cp037";
-    }
-
-    public CharToByteCp037() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1006.java b/src/share/classes/sun/io/CharToByteCp1006.java
deleted file mode 100644
index b55c112..0000000
--- a/src/share/classes/sun/io/CharToByteCp1006.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1006;
-
-/**
- * Tables and data to convert Unicode to Cp1006
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1006 extends CharToByteSingleByte {
-
-    private final static IBM1006 nioCoder = new IBM1006();
-
-    public String getCharacterEncoding() {
-        return "Cp1006";
-    }
-
-    public CharToByteCp1006() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1025.java b/src/share/classes/sun/io/CharToByteCp1025.java
deleted file mode 100644
index 247ae26..0000000
--- a/src/share/classes/sun/io/CharToByteCp1025.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1025;
-
-/**
- * Tables and data to convert Unicode to Cp1025
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1025 extends CharToByteSingleByte {
-
-    private final static IBM1025 nioCoder = new IBM1025();
-
-    public String getCharacterEncoding() {
-        return "Cp1025";
-    }
-
-    public CharToByteCp1025() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1026.java b/src/share/classes/sun/io/CharToByteCp1026.java
deleted file mode 100644
index 74962a8..0000000
--- a/src/share/classes/sun/io/CharToByteCp1026.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1026;
-
-/**
- * Tables and data to convert Unicode to Cp1026
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1026 extends CharToByteSingleByte {
-
-    private final static IBM1026 nioCoder = new IBM1026();
-
-    public String getCharacterEncoding() {
-        return "Cp1026";
-    }
-
-    public CharToByteCp1026() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1046.java b/src/share/classes/sun/io/CharToByteCp1046.java
deleted file mode 100644
index 4bd9a3c..0000000
--- a/src/share/classes/sun/io/CharToByteCp1046.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1046;
-
-/**
- * Tables and data to convert Unicode to Cp1046
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1046 extends CharToByteSingleByte {
-
-    private final static IBM1046 nioCoder = new IBM1046();
-
-    public String getCharacterEncoding() {
-        return "Cp1046";
-    }
-
-    public CharToByteCp1046() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1047.java b/src/share/classes/sun/io/CharToByteCp1047.java
deleted file mode 100644
index 0cb64cc..0000000
--- a/src/share/classes/sun/io/CharToByteCp1047.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1047;
-
-/**
- * Tables and data to convert Unicode to Cp1047
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1047 extends CharToByteSingleByte {
-
-    private final static IBM1047 nioCoder = new IBM1047();
-
-    public String getCharacterEncoding() {
-        return "Cp1047";
-    }
-
-    public CharToByteCp1047() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1097.java b/src/share/classes/sun/io/CharToByteCp1097.java
deleted file mode 100644
index 812467e..0000000
--- a/src/share/classes/sun/io/CharToByteCp1097.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1097;
-
-/**
- * Tables and data to convert Unicode to Cp1097
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1097 extends CharToByteSingleByte {
-
-    private final static IBM1097 nioCoder = new IBM1097();
-
-    public String getCharacterEncoding() {
-        return "Cp1097";
-    }
-
-    public CharToByteCp1097() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1098.java b/src/share/classes/sun/io/CharToByteCp1098.java
deleted file mode 100644
index a291bda..0000000
--- a/src/share/classes/sun/io/CharToByteCp1098.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1098;
-
-/**
- * Tables and data to convert Unicode to Cp1098
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1098 extends CharToByteSingleByte {
-
-    private final static IBM1098 nioCoder = new IBM1098();
-
-    public String getCharacterEncoding() {
-        return "Cp1098";
-    }
-
-    public CharToByteCp1098() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1112.java b/src/share/classes/sun/io/CharToByteCp1112.java
deleted file mode 100644
index 460b663..0000000
--- a/src/share/classes/sun/io/CharToByteCp1112.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1112;
-
-/**
- * Tables and data to convert Unicode to Cp1112
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1112 extends CharToByteSingleByte {
-
-    private final static IBM1112 nioCoder = new IBM1112();
-
-    public String getCharacterEncoding() {
-        return "Cp1112";
-    }
-
-    public CharToByteCp1112() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1122.java b/src/share/classes/sun/io/CharToByteCp1122.java
deleted file mode 100644
index 3eb8d35..0000000
--- a/src/share/classes/sun/io/CharToByteCp1122.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1122;
-
-/**
- * Tables and data to convert Unicode to Cp1122
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1122 extends CharToByteSingleByte {
-
-    private final static IBM1122 nioCoder = new IBM1122();
-
-    public String getCharacterEncoding() {
-        return "Cp1122";
-    }
-
-    public CharToByteCp1122() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1123.java b/src/share/classes/sun/io/CharToByteCp1123.java
deleted file mode 100644
index 9c7e287..0000000
--- a/src/share/classes/sun/io/CharToByteCp1123.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1123;
-
-/**
- * Tables and data to convert Unicode to Cp1123
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1123 extends CharToByteSingleByte {
-
-    private final static IBM1123 nioCoder = new IBM1123();
-
-    public String getCharacterEncoding() {
-        return "Cp1123";
-    }
-
-    public CharToByteCp1123() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1124.java b/src/share/classes/sun/io/CharToByteCp1124.java
deleted file mode 100644
index 5948002..0000000
--- a/src/share/classes/sun/io/CharToByteCp1124.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1124;
-
-/**
- * Tables and data to convert Unicode to Cp1124
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1124 extends CharToByteSingleByte {
-
-    private final static IBM1124 nioCoder = new IBM1124();
-
-    public String getCharacterEncoding() {
-        return "Cp1124";
-    }
-
-    public CharToByteCp1124() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1140.java b/src/share/classes/sun/io/CharToByteCp1140.java
deleted file mode 100644
index 5b17ee4..0000000
--- a/src/share/classes/sun/io/CharToByteCp1140.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1140;
-
-/**
- * Tables and data to convert Unicode to Cp1140
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1140 extends CharToByteSingleByte {
-
-    private final static IBM1140 nioCoder = new IBM1140();
-
-    public String getCharacterEncoding() {
-        return "Cp1140";
-    }
-
-    public CharToByteCp1140() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1141.java b/src/share/classes/sun/io/CharToByteCp1141.java
deleted file mode 100644
index fd662c7..0000000
--- a/src/share/classes/sun/io/CharToByteCp1141.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1141;
-
-/**
- * Tables and data to convert Unicode to Cp1141
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1141 extends CharToByteSingleByte {
-
-    private final static IBM1141 nioCoder = new IBM1141();
-
-    public String getCharacterEncoding() {
-        return "Cp1141";
-    }
-
-    public CharToByteCp1141() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1142.java b/src/share/classes/sun/io/CharToByteCp1142.java
deleted file mode 100644
index 0b3a11c..0000000
--- a/src/share/classes/sun/io/CharToByteCp1142.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1142;
-
-/**
- * Tables and data to convert Unicode to Cp1142
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1142 extends CharToByteSingleByte {
-
-    private final static IBM1142 nioCoder = new IBM1142();
-
-    public String getCharacterEncoding() {
-        return "Cp1142";
-    }
-
-    public CharToByteCp1142() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1143.java b/src/share/classes/sun/io/CharToByteCp1143.java
deleted file mode 100644
index 5417a92..0000000
--- a/src/share/classes/sun/io/CharToByteCp1143.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1143;
-
-/**
- * Tables and data to convert Unicode to Cp1143
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1143 extends CharToByteSingleByte {
-
-    private final static IBM1143 nioCoder = new IBM1143();
-
-    public String getCharacterEncoding() {
-        return "Cp1143";
-    }
-
-    public CharToByteCp1143() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1144.java b/src/share/classes/sun/io/CharToByteCp1144.java
deleted file mode 100644
index d7eaa74..0000000
--- a/src/share/classes/sun/io/CharToByteCp1144.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1144;
-
-/**
- * Tables and data to convert Unicode to Cp1144
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1144 extends CharToByteSingleByte {
-
-    private final static IBM1144 nioCoder = new IBM1144();
-
-    public String getCharacterEncoding() {
-        return "Cp1144";
-    }
-
-    public CharToByteCp1144() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1145.java b/src/share/classes/sun/io/CharToByteCp1145.java
deleted file mode 100644
index 637af83..0000000
--- a/src/share/classes/sun/io/CharToByteCp1145.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1145;
-
-/**
- * Tables and data to convert Unicode to Cp1145
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1145 extends CharToByteSingleByte {
-
-    private final static IBM1145 nioCoder = new IBM1145();
-
-    public String getCharacterEncoding() {
-        return "Cp1145";
-    }
-
-    public CharToByteCp1145() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1146.java b/src/share/classes/sun/io/CharToByteCp1146.java
deleted file mode 100644
index 580209d..0000000
--- a/src/share/classes/sun/io/CharToByteCp1146.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1146;
-
-/**
- * Tables and data to convert Unicode to Cp1146
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1146 extends CharToByteSingleByte {
-
-    private final static IBM1146 nioCoder = new IBM1146();
-
-    public String getCharacterEncoding() {
-        return "Cp1146";
-    }
-
-    public CharToByteCp1146() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1147.java b/src/share/classes/sun/io/CharToByteCp1147.java
deleted file mode 100644
index f88a3a9..0000000
--- a/src/share/classes/sun/io/CharToByteCp1147.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1147;
-
-/**
- * Tables and data to convert Unicode to Cp1147
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1147 extends CharToByteSingleByte {
-
-    private final static IBM1147 nioCoder = new IBM1147();
-
-    public String getCharacterEncoding() {
-        return "Cp1147";
-    }
-
-    public CharToByteCp1147() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1148.java b/src/share/classes/sun/io/CharToByteCp1148.java
deleted file mode 100644
index 421761b..0000000
--- a/src/share/classes/sun/io/CharToByteCp1148.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1148;
-
-/**
- * Tables and data to convert Unicode to Cp1148
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1148 extends CharToByteSingleByte {
-
-    private final static IBM1148 nioCoder = new IBM1148();
-
-    public String getCharacterEncoding() {
-        return "Cp1148";
-    }
-
-    public CharToByteCp1148() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1149.java b/src/share/classes/sun/io/CharToByteCp1149.java
deleted file mode 100644
index 3103faf..0000000
--- a/src/share/classes/sun/io/CharToByteCp1149.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM1149;
-
-/**
- * Tables and data to convert Unicode to Cp1149
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1149 extends CharToByteSingleByte {
-
-    private final static IBM1149 nioCoder = new IBM1149();
-
-    public String getCharacterEncoding() {
-        return "Cp1149";
-    }
-
-    public CharToByteCp1149() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1250.java b/src/share/classes/sun/io/CharToByteCp1250.java
deleted file mode 100644
index 7561b5c..0000000
--- a/src/share/classes/sun/io/CharToByteCp1250.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.MS1250;
-
-/**
- * Tables and data to convert Unicode to Cp1250
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1250 extends CharToByteSingleByte {
-
-    private final static MS1250 nioCoder = new MS1250();
-
-    public String getCharacterEncoding() {
-        return "Cp1250";
-    }
-
-    public CharToByteCp1250() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1251.java b/src/share/classes/sun/io/CharToByteCp1251.java
deleted file mode 100644
index 9eb0dcb..0000000
--- a/src/share/classes/sun/io/CharToByteCp1251.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.MS1251;
-
-/**
- * Tables and data to convert Unicode to Cp1251
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1251 extends CharToByteSingleByte {
-
-    private final static MS1251 nioCoder = new MS1251();
-
-    public String getCharacterEncoding() {
-        return "Cp1251";
-    }
-
-    public CharToByteCp1251() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1252.java b/src/share/classes/sun/io/CharToByteCp1252.java
deleted file mode 100644
index 0bfc2cd..0000000
--- a/src/share/classes/sun/io/CharToByteCp1252.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.MS1252;
-
-/**
- * Tables and data to convert Unicode to Cp1252
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1252 extends CharToByteSingleByte {
-
-    private final static MS1252 nioCoder = new MS1252();
-
-    public String getCharacterEncoding() {
-        return "Cp1252";
-    }
-
-    public CharToByteCp1252() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1253.java b/src/share/classes/sun/io/CharToByteCp1253.java
deleted file mode 100644
index 7aaef74..0000000
--- a/src/share/classes/sun/io/CharToByteCp1253.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.MS1253;
-
-/**
- * Tables and data to convert Unicode to Cp1253
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1253 extends CharToByteSingleByte {
-
-    private final static MS1253 nioCoder = new MS1253();
-
-    public String getCharacterEncoding() {
-        return "Cp1253";
-    }
-
-    public CharToByteCp1253() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1254.java b/src/share/classes/sun/io/CharToByteCp1254.java
deleted file mode 100644
index 8ebc626..0000000
--- a/src/share/classes/sun/io/CharToByteCp1254.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.MS1254;
-
-/**
- * Tables and data to convert Unicode to Cp1254
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1254 extends CharToByteSingleByte {
-
-    private final static MS1254 nioCoder = new MS1254();
-
-    public String getCharacterEncoding() {
-        return "Cp1254";
-    }
-
-    public CharToByteCp1254() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1255.java b/src/share/classes/sun/io/CharToByteCp1255.java
deleted file mode 100644
index 4bb8da7..0000000
--- a/src/share/classes/sun/io/CharToByteCp1255.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MS1255;
-
-/**
- * Tables and data to convert Unicode to Cp1255
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1255 extends CharToByteSingleByte {
-
-    private final static MS1255 nioCoder = new MS1255();
-
-    public String getCharacterEncoding() {
-        return "Cp1255";
-    }
-
-    public CharToByteCp1255() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1256.java b/src/share/classes/sun/io/CharToByteCp1256.java
deleted file mode 100644
index 638df51..0000000
--- a/src/share/classes/sun/io/CharToByteCp1256.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MS1256;
-
-/**
- * Tables and data to convert Unicode to Cp1256
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1256 extends CharToByteSingleByte {
-
-    private final static MS1256 nioCoder = new MS1256();
-
-    public String getCharacterEncoding() {
-        return "Cp1256";
-    }
-
-    public CharToByteCp1256() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1257.java b/src/share/classes/sun/io/CharToByteCp1257.java
deleted file mode 100644
index d5c174f..0000000
--- a/src/share/classes/sun/io/CharToByteCp1257.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.MS1257;
-
-/**
- * Tables and data to convert Unicode to Cp1257
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1257 extends CharToByteSingleByte {
-
-    private final static MS1257 nioCoder = new MS1257();
-
-    public String getCharacterEncoding() {
-        return "Cp1257";
-    }
-
-    public CharToByteCp1257() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1258.java b/src/share/classes/sun/io/CharToByteCp1258.java
deleted file mode 100644
index b6e2711..0000000
--- a/src/share/classes/sun/io/CharToByteCp1258.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MS1258;
-
-/**
- * Tables and data to convert Unicode to Cp1258
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp1258 extends CharToByteSingleByte {
-
-    private final static MS1258 nioCoder = new MS1258();
-
-    public String getCharacterEncoding() {
-        return "Cp1258";
-    }
-
-    public CharToByteCp1258() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1381.java b/src/share/classes/sun/io/CharToByteCp1381.java
deleted file mode 100644
index 06dfc91..0000000
--- a/src/share/classes/sun/io/CharToByteCp1381.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp1381 extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp1381";
-    }
-
-    public CharToByteCp1381() {
-        super((DoubleByte.Encoder)new IBM1381().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp1383.java b/src/share/classes/sun/io/CharToByteCp1383.java
deleted file mode 100644
index 7e61beb..0000000
--- a/src/share/classes/sun/io/CharToByteCp1383.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp1383 extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp1383";
-    }
-
-    public CharToByteCp1383() {
-        super((DoubleByte.Encoder)new IBM1383().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp273.java b/src/share/classes/sun/io/CharToByteCp273.java
deleted file mode 100644
index dc617bf..0000000
--- a/src/share/classes/sun/io/CharToByteCp273.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM273;
-
-/**
- * Tables and data to convert Unicode to Cp273
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp273 extends CharToByteSingleByte {
-
-    private final static IBM273 nioCoder = new IBM273();
-
-    public String getCharacterEncoding() {
-        return "Cp273";
-    }
-
-    public CharToByteCp273() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp277.java b/src/share/classes/sun/io/CharToByteCp277.java
deleted file mode 100644
index 7d36a3e..0000000
--- a/src/share/classes/sun/io/CharToByteCp277.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM277;
-
-/**
- * Tables and data to convert Unicode to Cp277
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp277 extends CharToByteSingleByte {
-
-    private final static IBM277 nioCoder = new IBM277();
-
-    public String getCharacterEncoding() {
-        return "Cp277";
-    }
-
-    public CharToByteCp277() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp278.java b/src/share/classes/sun/io/CharToByteCp278.java
deleted file mode 100644
index 555dac4..0000000
--- a/src/share/classes/sun/io/CharToByteCp278.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM278;
-
-/**
- * Tables and data to convert Unicode to Cp278
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp278 extends CharToByteSingleByte {
-
-    private final static IBM278 nioCoder = new IBM278();
-
-    public String getCharacterEncoding() {
-        return "Cp278";
-    }
-
-    public CharToByteCp278() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp280.java b/src/share/classes/sun/io/CharToByteCp280.java
deleted file mode 100644
index e02c1ed..0000000
--- a/src/share/classes/sun/io/CharToByteCp280.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM280;
-
-/**
- * Tables and data to convert Unicode to Cp280
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp280 extends CharToByteSingleByte {
-
-    private final static IBM280 nioCoder = new IBM280();
-
-    public String getCharacterEncoding() {
-        return "Cp280";
-    }
-
-    public CharToByteCp280() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp284.java b/src/share/classes/sun/io/CharToByteCp284.java
deleted file mode 100644
index 110463c..0000000
--- a/src/share/classes/sun/io/CharToByteCp284.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM284;
-
-/**
- * Tables and data to convert Unicode to Cp284
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp284 extends CharToByteSingleByte {
-
-    private final static IBM284 nioCoder = new IBM284();
-
-    public String getCharacterEncoding() {
-        return "Cp284";
-    }
-
-    public CharToByteCp284() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp285.java b/src/share/classes/sun/io/CharToByteCp285.java
deleted file mode 100644
index f26a378..0000000
--- a/src/share/classes/sun/io/CharToByteCp285.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM285;
-
-/**
- * Tables and data to convert Unicode to Cp285
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp285 extends CharToByteSingleByte {
-
-    private final static IBM285 nioCoder = new IBM285();
-
-    public String getCharacterEncoding() {
-        return "Cp285";
-    }
-
-    public CharToByteCp285() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp297.java b/src/share/classes/sun/io/CharToByteCp297.java
deleted file mode 100644
index e459019..0000000
--- a/src/share/classes/sun/io/CharToByteCp297.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM297;
-
-/**
- * Tables and data to convert Unicode to Cp297
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp297 extends CharToByteSingleByte {
-
-    private final static IBM297 nioCoder = new IBM297();
-
-    public String getCharacterEncoding() {
-        return "Cp297";
-    }
-
-    public CharToByteCp297() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp33722.java b/src/share/classes/sun/io/CharToByteCp33722.java
deleted file mode 100644
index be12f54..0000000
--- a/src/share/classes/sun/io/CharToByteCp33722.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.IBM33722;
-
-/**
-* Tables and data to convert Unicode to Cp33722
-*
-* @author Malcolm Ayres, assisted by UniMap program
-*/
-public class CharToByteCp33722
-        extends CharToByteEUC
-
-{
-        private final static IBM33722 nioCoder = new IBM33722();
-
-        // Return the character set id
-        public String getCharacterEncoding()
-        {
-                return "Cp33722";
-        }
-
-        public int getMaxBytesPerChar() {
-                return 3;
-        }
-
-        public CharToByteCp33722()
-        {
-                super();
-                super.mask1 = 0xFFE0;
-                super.mask2 = 0x001F;
-                super.shift = 5;
-                super.index1 = nioCoder.getEncoderIndex1();
-                super.index2 = nioCoder.getEncoderIndex2();
-                super.index2a = nioCoder.getEncoderIndex2a();
-                super.index2b = nioCoder.getEncoderIndex2b();
-        }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp420.java b/src/share/classes/sun/io/CharToByteCp420.java
deleted file mode 100644
index e4dbf42..0000000
--- a/src/share/classes/sun/io/CharToByteCp420.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM420;
-
-/**
- * Tables and data to convert Unicode to Cp420
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp420 extends CharToByteSingleByte {
-
-    private final static IBM420 nioCoder = new IBM420();
-
-    public String getCharacterEncoding() {
-        return "Cp420";
-    }
-
-    public CharToByteCp420() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp424.java b/src/share/classes/sun/io/CharToByteCp424.java
deleted file mode 100644
index 99f2ca4..0000000
--- a/src/share/classes/sun/io/CharToByteCp424.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM424;
-
-/**
- * Tables and data to convert Unicode to Cp424
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp424 extends CharToByteSingleByte {
-
-    private final static IBM424 nioCoder = new IBM424();
-
-    public String getCharacterEncoding() {
-        return "Cp424";
-    }
-
-    public CharToByteCp424() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp437.java b/src/share/classes/sun/io/CharToByteCp437.java
deleted file mode 100644
index 8c24b71..0000000
--- a/src/share/classes/sun/io/CharToByteCp437.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM437;
-
-/**
- * Tables and data to convert Unicode to Cp437
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp437 extends CharToByteSingleByte {
-
-    private final static IBM437 nioCoder = new IBM437();
-
-    public String getCharacterEncoding() {
-        return "Cp437";
-    }
-
-    public CharToByteCp437() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp500.java b/src/share/classes/sun/io/CharToByteCp500.java
deleted file mode 100644
index 6a0bf25..0000000
--- a/src/share/classes/sun/io/CharToByteCp500.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM500;
-
-/**
- * Tables and data to convert Unicode to Cp500
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp500 extends CharToByteSingleByte {
-
-    private final static IBM500 nioCoder = new IBM500();
-
-    public String getCharacterEncoding() {
-        return "Cp500";
-    }
-
-    public CharToByteCp500() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp737.java b/src/share/classes/sun/io/CharToByteCp737.java
deleted file mode 100644
index f1f26e4..0000000
--- a/src/share/classes/sun/io/CharToByteCp737.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM737;
-
-/**
- * Tables and data to convert Unicode to Cp737
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp737 extends CharToByteSingleByte {
-
-    private final static IBM737 nioCoder = new IBM737();
-
-    public String getCharacterEncoding() {
-        return "Cp737";
-    }
-
-    public CharToByteCp737() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp775.java b/src/share/classes/sun/io/CharToByteCp775.java
deleted file mode 100644
index 7dba769..0000000
--- a/src/share/classes/sun/io/CharToByteCp775.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM775;
-
-/**
- * Tables and data to convert Unicode to Cp775
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp775 extends CharToByteSingleByte {
-
-    private final static IBM775 nioCoder = new IBM775();
-
-    public String getCharacterEncoding() {
-        return "Cp775";
-    }
-
-    public CharToByteCp775() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp833.java b/src/share/classes/sun/io/CharToByteCp833.java
deleted file mode 100644
index 23f34c5..0000000
--- a/src/share/classes/sun/io/CharToByteCp833.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM833;
-
-public class CharToByteCp833 extends CharToByteSingleByte {
-
-    private final static IBM833 nioCoder = new IBM833();
-
-    public String getCharacterEncoding() {
-        return "Cp833";
-    }
-
-    public CharToByteCp833() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
-
diff --git a/src/share/classes/sun/io/CharToByteCp834.java b/src/share/classes/sun/io/CharToByteCp834.java
deleted file mode 100644
index 9494c07..0000000
--- a/src/share/classes/sun/io/CharToByteCp834.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-//EBIDIC DBCSONLY Korean
-
-public class CharToByteCp834 extends CharToByteDBCS_ASCII {
-
-    public CharToByteCp834() {
-       super((DoubleByte.Encoder)new IBM834().newEncoder());
-       subBytes = new byte[] {(byte)0xfe, (byte)0xfe};
-    }
-
-    public int getMaxBytesPerChar() {
-       return 2;
-    }
-
-    public String getCharacterEncoding() {
-       return "Cp834";
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp838.java b/src/share/classes/sun/io/CharToByteCp838.java
deleted file mode 100644
index ee750db..0000000
--- a/src/share/classes/sun/io/CharToByteCp838.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM838;
-
-/**
- * Tables and data to convert Unicode to Cp838
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp838 extends CharToByteSingleByte {
-
-    private final static IBM838 nioCoder = new IBM838();
-
-    public String getCharacterEncoding() {
-        return "Cp838";
-    }
-
-    public CharToByteCp838() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp850.java b/src/share/classes/sun/io/CharToByteCp850.java
deleted file mode 100644
index c79e0c4..0000000
--- a/src/share/classes/sun/io/CharToByteCp850.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM850;
-
-/**
- * Tables and data to convert Unicode to Cp850
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp850 extends CharToByteSingleByte {
-
-    private final static IBM850 nioCoder = new IBM850();
-
-    public String getCharacterEncoding() {
-        return "Cp850";
-    }
-
-    public CharToByteCp850() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp852.java b/src/share/classes/sun/io/CharToByteCp852.java
deleted file mode 100644
index 47c17ef..0000000
--- a/src/share/classes/sun/io/CharToByteCp852.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM852;
-
-/**
- * Tables and data to convert Unicode to Cp852
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp852 extends CharToByteSingleByte {
-
-    private final static IBM852 nioCoder = new IBM852();
-
-    public String getCharacterEncoding() {
-        return "Cp852";
-    }
-
-    public CharToByteCp852() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp855.java b/src/share/classes/sun/io/CharToByteCp855.java
deleted file mode 100644
index e16fc69..0000000
--- a/src/share/classes/sun/io/CharToByteCp855.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM855;
-
-/**
- * Tables and data to convert Unicode to Cp855
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp855 extends CharToByteSingleByte {
-
-    private final static IBM855 nioCoder = new IBM855();
-
-    public String getCharacterEncoding() {
-        return "Cp855";
-    }
-
-    public CharToByteCp855() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp856.java b/src/share/classes/sun/io/CharToByteCp856.java
deleted file mode 100644
index d18d47b..0000000
--- a/src/share/classes/sun/io/CharToByteCp856.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM856;
-
-/**
- * Tables and data to convert Unicode to Cp856
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp856 extends CharToByteSingleByte {
-
-    private final static IBM856 nioCoder = new IBM856();
-
-    public String getCharacterEncoding() {
-        return "Cp856";
-    }
-
-    public CharToByteCp856() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp857.java b/src/share/classes/sun/io/CharToByteCp857.java
deleted file mode 100644
index 79055f0..0000000
--- a/src/share/classes/sun/io/CharToByteCp857.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM857;
-
-/**
- * Tables and data to convert Unicode to Cp857
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp857 extends CharToByteSingleByte {
-
-    private final static IBM857 nioCoder = new IBM857();
-
-    public String getCharacterEncoding() {
-        return "Cp857";
-    }
-
-    public CharToByteCp857() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp858.java b/src/share/classes/sun/io/CharToByteCp858.java
deleted file mode 100644
index 3d6b849..0000000
--- a/src/share/classes/sun/io/CharToByteCp858.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM858;
-
-/**
- * Tables and data to convert Unicode to Cp858
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp858 extends CharToByteSingleByte {
-
-    public String getCharacterEncoding() {
-        return "Cp858";
-    }
-
-    private final static IBM858 nioCoder = new IBM858();
-
-    public CharToByteCp858() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp860.java b/src/share/classes/sun/io/CharToByteCp860.java
deleted file mode 100644
index 46b07ee..0000000
--- a/src/share/classes/sun/io/CharToByteCp860.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM860;
-
-/**
- * Tables and data to convert Unicode to Cp860
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp860 extends CharToByteSingleByte {
-
-    private final static IBM860 nioCoder = new IBM860();
-
-    public String getCharacterEncoding() {
-        return "Cp860";
-    }
-
-    public CharToByteCp860() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp861.java b/src/share/classes/sun/io/CharToByteCp861.java
deleted file mode 100644
index d0c1f32..0000000
--- a/src/share/classes/sun/io/CharToByteCp861.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM861;
-
-/**
- * Tables and data to convert Unicode to Cp861
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp861 extends CharToByteSingleByte {
-
-    private final static IBM861 nioCoder = new IBM861();
-
-    public String getCharacterEncoding() {
-        return "Cp861";
-    }
-
-    public CharToByteCp861() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp862.java b/src/share/classes/sun/io/CharToByteCp862.java
deleted file mode 100644
index c819680..0000000
--- a/src/share/classes/sun/io/CharToByteCp862.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM862;
-
-/**
- * Tables and data to convert Unicode to Cp862
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp862 extends CharToByteSingleByte {
-
-    private final static IBM862 nioCoder = new IBM862();
-
-    public String getCharacterEncoding() {
-        return "Cp862";
-    }
-
-    public CharToByteCp862() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp863.java b/src/share/classes/sun/io/CharToByteCp863.java
deleted file mode 100644
index 1786e8c..0000000
--- a/src/share/classes/sun/io/CharToByteCp863.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM863;
-
-/**
- * Tables and data to convert Unicode to Cp863
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp863 extends CharToByteSingleByte {
-
-    private final static IBM863 nioCoder = new IBM863();
-
-    public String getCharacterEncoding() {
-        return "Cp863";
-    }
-
-    public CharToByteCp863() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp864.java b/src/share/classes/sun/io/CharToByteCp864.java
deleted file mode 100644
index 08381d2..0000000
--- a/src/share/classes/sun/io/CharToByteCp864.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM864;
-
-/**
- * Tables and data to convert Unicode to Cp864
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp864 extends CharToByteSingleByte {
-
-    private final static IBM864 nioCoder = new IBM864();
-
-    public String getCharacterEncoding() {
-        return "Cp864";
-    }
-
-    public CharToByteCp864() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp865.java b/src/share/classes/sun/io/CharToByteCp865.java
deleted file mode 100644
index 36da989..0000000
--- a/src/share/classes/sun/io/CharToByteCp865.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM865;
-
-/**
- * Tables and data to convert Unicode to Cp865
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp865 extends CharToByteSingleByte {
-
-    private final static IBM865 nioCoder = new IBM865();
-
-    public String getCharacterEncoding() {
-        return "Cp865";
-    }
-
-    public CharToByteCp865() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp866.java b/src/share/classes/sun/io/CharToByteCp866.java
deleted file mode 100644
index 73bd8f3..0000000
--- a/src/share/classes/sun/io/CharToByteCp866.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM866;
-
-/**
- * Tables and data to convert Unicode to Cp866
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp866 extends CharToByteSingleByte {
-
-    private final static IBM866 nioCoder = new IBM866();
-
-    public String getCharacterEncoding() {
-        return "Cp866";
-    }
-
-    public CharToByteCp866() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp868.java b/src/share/classes/sun/io/CharToByteCp868.java
deleted file mode 100644
index af40daf..0000000
--- a/src/share/classes/sun/io/CharToByteCp868.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM868;
-
-/**
- * Tables and data to convert Unicode to Cp868
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp868 extends CharToByteSingleByte {
-
-    private final static IBM868 nioCoder = new IBM868();
-
-    public String getCharacterEncoding() {
-        return "Cp868";
-    }
-
-    public CharToByteCp868() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp869.java b/src/share/classes/sun/io/CharToByteCp869.java
deleted file mode 100644
index d431953..0000000
--- a/src/share/classes/sun/io/CharToByteCp869.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM869;
-
-/**
- * Tables and data to convert Unicode to Cp869
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp869 extends CharToByteSingleByte {
-
-    private final static IBM869 nioCoder = new IBM869();
-
-    public String getCharacterEncoding() {
-        return "Cp869";
-    }
-
-    public CharToByteCp869() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp870.java b/src/share/classes/sun/io/CharToByteCp870.java
deleted file mode 100644
index f7e6217..0000000
--- a/src/share/classes/sun/io/CharToByteCp870.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM870;
-
-/**
- * Tables and data to convert Unicode to Cp870
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp870 extends CharToByteSingleByte {
-
-    private final static IBM870 nioCoder = new IBM870();
-
-    public String getCharacterEncoding() {
-        return "Cp870";
-    }
-
-    public CharToByteCp870() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp871.java b/src/share/classes/sun/io/CharToByteCp871.java
deleted file mode 100644
index 3b79a90..0000000
--- a/src/share/classes/sun/io/CharToByteCp871.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM871;
-
-/**
- * Tables and data to convert Unicode to Cp871
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp871 extends CharToByteSingleByte {
-
-    private final static IBM871 nioCoder = new IBM871();
-
-    public String getCharacterEncoding() {
-        return "Cp871";
-    }
-
-    public CharToByteCp871() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp874.java b/src/share/classes/sun/io/CharToByteCp874.java
deleted file mode 100644
index 4b5461f..0000000
--- a/src/share/classes/sun/io/CharToByteCp874.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.IBM874;
-
-/**
- * Tables and data to convert Unicode to Cp874
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp874 extends CharToByteSingleByte {
-
-    private final static IBM874 nioCoder = new IBM874();
-
-    public String getCharacterEncoding() {
-        return "Cp874";
-    }
-
-    public CharToByteCp874() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp875.java b/src/share/classes/sun/io/CharToByteCp875.java
deleted file mode 100644
index 503582d..0000000
--- a/src/share/classes/sun/io/CharToByteCp875.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM875;
-
-/**
- * Tables and data to convert Unicode to Cp875
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp875 extends CharToByteSingleByte {
-
-    private final static IBM875 nioCoder = new IBM875();
-
-    public String getCharacterEncoding() {
-        return "Cp875";
-    }
-
-    public CharToByteCp875() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp918.java b/src/share/classes/sun/io/CharToByteCp918.java
deleted file mode 100644
index ce51a36..0000000
--- a/src/share/classes/sun/io/CharToByteCp918.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM918;
-
-/**
- * Tables and data to convert Unicode to Cp918
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp918 extends CharToByteSingleByte {
-
-    private final static IBM918 nioCoder = new IBM918();
-
-    public String getCharacterEncoding() {
-        return "Cp918";
-    }
-
-    public CharToByteCp918() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp921.java b/src/share/classes/sun/io/CharToByteCp921.java
deleted file mode 100644
index 1589592..0000000
--- a/src/share/classes/sun/io/CharToByteCp921.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM921;
-
-/**
- * Tables and data to convert Unicode to Cp921
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp921 extends CharToByteSingleByte {
-
-    private final static IBM921 nioCoder = new IBM921();
-
-    public String getCharacterEncoding() {
-        return "Cp921";
-    }
-
-    public CharToByteCp921() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp922.java b/src/share/classes/sun/io/CharToByteCp922.java
deleted file mode 100644
index 222d67d..0000000
--- a/src/share/classes/sun/io/CharToByteCp922.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.IBM922;
-
-/**
- * Tables and data to convert Unicode to Cp922
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteCp922 extends CharToByteSingleByte {
-
-    private final static IBM922 nioCoder = new IBM922();
-
-    public String getCharacterEncoding() {
-        return "Cp922";
-    }
-
-    public CharToByteCp922() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp930.java b/src/share/classes/sun/io/CharToByteCp930.java
deleted file mode 100644
index 9e5132b..0000000
--- a/src/share/classes/sun/io/CharToByteCp930.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp930 extends CharToByteDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp930";
-    }
-
-    public CharToByteCp930() {
-        super((DoubleByte.Encoder)new IBM930().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp933.java b/src/share/classes/sun/io/CharToByteCp933.java
deleted file mode 100644
index 2146278..0000000
--- a/src/share/classes/sun/io/CharToByteCp933.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp933 extends CharToByteDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp933";
-    }
-
-    public CharToByteCp933() {
-        super((DoubleByte.Encoder)new IBM933().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp935.java b/src/share/classes/sun/io/CharToByteCp935.java
deleted file mode 100644
index e72126f..0000000
--- a/src/share/classes/sun/io/CharToByteCp935.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp935 extends CharToByteDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp935";
-    }
-
-    public CharToByteCp935() {
-        super((DoubleByte.Encoder)new IBM935().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp937.java b/src/share/classes/sun/io/CharToByteCp937.java
deleted file mode 100644
index c698cd4..0000000
--- a/src/share/classes/sun/io/CharToByteCp937.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp937 extends CharToByteDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp937";
-    }
-
-    public CharToByteCp937() {
-        super((DoubleByte.Encoder)new IBM937().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp939.java b/src/share/classes/sun/io/CharToByteCp939.java
deleted file mode 100644
index c9d7c00..0000000
--- a/src/share/classes/sun/io/CharToByteCp939.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp939 extends CharToByteDBCS_EBCDIC {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp939";
-    }
-
-    public CharToByteCp939() {
-        super((DoubleByte.Encoder)new IBM939().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp942.java b/src/share/classes/sun/io/CharToByteCp942.java
deleted file mode 100644
index 7abd3e1..0000000
--- a/src/share/classes/sun/io/CharToByteCp942.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp942  extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp942";
-    }
-
-    public CharToByteCp942() {
-        super((DoubleByte.Encoder)new IBM942().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp942C.java b/src/share/classes/sun/io/CharToByteCp942C.java
deleted file mode 100644
index 55778c1..0000000
--- a/src/share/classes/sun/io/CharToByteCp942C.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp942C extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp942C";
-    }
-
-    public CharToByteCp942C() {
-        super((DoubleByte.Encoder)new IBM942C().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp943.java b/src/share/classes/sun/io/CharToByteCp943.java
deleted file mode 100644
index 794a3f5..0000000
--- a/src/share/classes/sun/io/CharToByteCp943.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp943 extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp943";
-    }
-
-    public CharToByteCp943() {
-        super((DoubleByte.Encoder)new IBM943().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp943C.java b/src/share/classes/sun/io/CharToByteCp943C.java
deleted file mode 100644
index c43ee4e..0000000
--- a/src/share/classes/sun/io/CharToByteCp943C.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp943C extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp943C";
-    }
-
-    public CharToByteCp943C() {
-        super((DoubleByte.Encoder)new IBM943C().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp948.java b/src/share/classes/sun/io/CharToByteCp948.java
deleted file mode 100644
index 3f74a10..0000000
--- a/src/share/classes/sun/io/CharToByteCp948.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp948 extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp948";
-    }
-
-    public CharToByteCp948() {
-        super((DoubleByte.Encoder)new IBM948().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp949.java b/src/share/classes/sun/io/CharToByteCp949.java
deleted file mode 100644
index 573dae9..0000000
--- a/src/share/classes/sun/io/CharToByteCp949.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp949 extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp949";
-    }
-
-    public CharToByteCp949() {
-        super((DoubleByte.Encoder)new IBM949().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp949C.java b/src/share/classes/sun/io/CharToByteCp949C.java
deleted file mode 100644
index e72b679..0000000
--- a/src/share/classes/sun/io/CharToByteCp949C.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp949C extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp949C";
-    }
-
-    public CharToByteCp949C() {
-        super((DoubleByte.Encoder)new IBM949C().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp950.java b/src/share/classes/sun/io/CharToByteCp950.java
deleted file mode 100644
index ac58ebf..0000000
--- a/src/share/classes/sun/io/CharToByteCp950.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteCp950 extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp950";
-    }
-
-    public CharToByteCp950() {
-        super((DoubleByte.Encoder)new IBM950().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp964.java b/src/share/classes/sun/io/CharToByteCp964.java
deleted file mode 100644
index 4a09cd0..0000000
--- a/src/share/classes/sun/io/CharToByteCp964.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.IBM964;
-
-/**
-* Tables and data to convert Unicode to Cp964
-*
-* @author Malcolm Ayres, assisted by UniMap program
-*/
-public class CharToByteCp964
-        extends CharToByteEUC
-
-{
-        private final static IBM964 nioCoder = new IBM964();
-
-        // Return the character set id
-        public String getCharacterEncoding()
-        {
-                return "Cp964";
-        }
-
-        public int getMaxBytesPerChar() {
-                return 4;
-        }
-
-        public CharToByteCp964()
-        {
-                super();
-                super.mask1 = 0xFFC0;
-                super.mask2 = 0x003F;
-                super.shift = 6;
-                super.index1 = nioCoder.getEncoderIndex1();
-                super.index2 = nioCoder.getEncoderIndex2();
-                super.index2a = nioCoder.getEncoderIndex2a();
-                super.index2b = nioCoder.getEncoderIndex2b();
-                super.index2c = nioCoder.getEncoderIndex2c();
-        }
-}
diff --git a/src/share/classes/sun/io/CharToByteCp970.java b/src/share/classes/sun/io/CharToByteCp970.java
deleted file mode 100644
index 4041ca7..0000000
--- a/src/share/classes/sun/io/CharToByteCp970.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-// EUC_Simple is the same as DBCS_ASCII
-public class CharToByteCp970 extends CharToByteDBCS_ASCII {
-
-    // Return the character set id
-    public String getCharacterEncoding() {
-        return "Cp970";
-    }
-
-    public CharToByteCp970() {
-        super((DoubleByte.Encoder)new IBM970().newEncoder());
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteDBCS_ASCII.java b/src/share/classes/sun/io/CharToByteDBCS_ASCII.java
deleted file mode 100644
index ca261fc..0000000
--- a/src/share/classes/sun/io/CharToByteDBCS_ASCII.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import static sun.nio.cs.CharsetMapping.*;
-
-public abstract class CharToByteDBCS_ASCII extends CharToByteConverter
-{
-
-    private char highHalfZoneCode;
-    private byte[] outputByte = new byte[2];
-
-    private DoubleByte.Encoder enc;
-
-    public CharToByteDBCS_ASCII(DoubleByte.Encoder enc) {
-        super();
-        this.enc = enc;
-    }
-
-    int encodeChar(char c) {
-        return enc.encodeChar(c);
-    }
-
-    /**
-      * flush out any residual data and reset the buffer state
-      */
-    public int flush(byte [] output, int outStart, int outEnd)
-        throws MalformedInputException, ConversionBufferFullException
-    {
-
-       if (highHalfZoneCode != 0) {
-          reset();
-          badInputLength = 0;
-          throw new MalformedInputException();
-       }
-
-       reset();
-       return 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        char    inputChar;
-        int     inputSize;
-
-        byteOff = outOff;
-        charOff = inOff;
-
-        while(charOff < inEnd) {
-            int   index;
-            int   theBytes;
-            int   spaceNeeded;
-
-            if (highHalfZoneCode == 0) {
-                inputChar = input[charOff];
-                inputSize = 1;
-            } else {
-                inputChar = highHalfZoneCode;
-                inputSize = 0;
-                highHalfZoneCode = 0;
-            }
-
-            // Is this a high surrogate?
-            if (Character.isHighSurrogate(inputChar)) {
-                // Is this the last character of the input?
-                if (charOff + inputSize >= inEnd) {
-                    highHalfZoneCode = inputChar;
-                    charOff += inputSize;
-                    break;
-                }
-
-                // Is there a low surrogate following?
-                inputChar = input[charOff + inputSize];
-                if (Character.isLowSurrogate(inputChar)) {
-                    // We have a valid surrogate pair.  Too bad we don't do
-                    // surrogates.  Is substitution enabled?
-                    if (subMode) {
-                        if (subBytes.length == 1) {
-                            outputByte[0] = 0x00;
-                            outputByte[1] = subBytes[0];
-                        }
-                        else {
-                            outputByte[0] = subBytes[0];
-                            outputByte[1] = subBytes[1];
-                        }
-                        inputSize++;
-                    } else {
-                        badInputLength = 2;
-                        throw new UnknownCharacterException();
-                    }
-                 } else {
-                     // We have a malformed surrogate pair
-                     badInputLength = 1;
-                     throw new MalformedInputException();
-                 }
-            }
-            // Is this an unaccompanied low surrogate?
-            else if (Character.isLowSurrogate(inputChar)) {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            } else {
-
-                // We have a valid character, get the bytes for it
-                theBytes = encodeChar(inputChar);
-                if (theBytes == UNMAPPABLE_ENCODING) {
-                    // if there was no mapping - look for substitution characters
-                    if (subMode) {
-                        if (subBytes.length == 1) {
-                            outputByte[0] = 0x00;
-                            outputByte[1] = subBytes[0];
-                        } else {
-                            outputByte[0] = subBytes[0];
-                            outputByte[1] = subBytes[1];
-                        }
-                    } else {
-                        badInputLength = 1;
-                        throw new UnknownCharacterException();
-                    }
-                } else {
-                    outputByte[0] = (byte)(theBytes >>8);
-                    outputByte[1] = (byte)theBytes;
-                }
-            }
-            if (outputByte[0] == 0x00)
-                spaceNeeded = 1;
-            else
-                spaceNeeded = 2;
-
-            if (byteOff + spaceNeeded > outEnd)
-                throw new ConversionBufferFullException();
-
-            if (spaceNeeded == 1)
-                output[byteOff++] = outputByte[1];
-            else {
-                output[byteOff++] = outputByte[0];
-                output[byteOff++] = outputByte[1];
-            }
-
-            charOff += inputSize;
-        }
-        return byteOff - outOff;
-    }
-
-    /**
-     * Resets converter to its initial state.
-     */
-    public void reset() {
-       charOff = byteOff = 0;
-       highHalfZoneCode = 0;
-    }
-
-    /**
-     * Returns the maximum number of bytes needed to convert a char.
-     */
-    public int getMaxBytesPerChar() {
-        return 2;
-    }
-
-    /**
-     * Returns true if the given character can be converted to the
-     * target character encoding.
-     */
-    public boolean canConvert(char c) {
-        return encodeChar(c) != UNMAPPABLE_ENCODING;
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java b/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java
deleted file mode 100644
index 8a7a1fd..0000000
--- a/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import static sun.nio.cs.CharsetMapping.*;
-
-public abstract class CharToByteDBCS_EBCDIC extends CharToByteConverter
-{
-    private static final int SBCS = 0;
-    private static final int DBCS = 1;
-
-    private static final byte SO = 0x0e;
-    private static final byte SI = 0x0f;
-
-    private int  currentState;
-    private char highHalfZoneCode;
-    private byte[] outputByte = new byte[2];
-
-    private DoubleByte.Encoder enc;
-
-    public CharToByteDBCS_EBCDIC(DoubleByte.Encoder enc) {
-        super();
-        highHalfZoneCode = 0;
-        currentState = SBCS;
-        this.enc = enc;
-    }
-
-    int encodeChar(char c) {
-        return enc.encodeChar(c);
-    }
-
-    /**
-      * flush out any residual data and reset the buffer state
-      */
-    public int flush(byte [] output, int outStart, int outEnd)
-        throws MalformedInputException, ConversionBufferFullException
-    {
-        int bytesOut = 0;
-
-        if (highHalfZoneCode != 0) {
-            reset();
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-
-        if (currentState == DBCS) {
-          if (outStart >= outEnd)
-            throw new ConversionBufferFullException();
-          output[outStart] = SI;
-          bytesOut++;
-        }
-
-        reset();
-        return bytesOut;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        char    inputChar;
-        int     inputSize;
-
-        byteOff = outOff;
-        charOff = inOff;
-
-        while(charOff < inEnd) {
-
-           int   index;
-           int   theBytes;
-           int   spaceNeeded;
-
-           if (highHalfZoneCode == 0) {
-              inputChar = input[charOff];
-              inputSize = 1;
-           } else {
-              inputChar = highHalfZoneCode;
-              inputSize = 0;
-              highHalfZoneCode = 0;
-           }
-
-           // Is this a high surrogate?
-           if (Character.isHighSurrogate(inputChar)) {
-              // Is this the last character of the input?
-              if (charOff + inputSize >= inEnd) {
-                 highHalfZoneCode = inputChar;
-                 charOff += inputSize;
-                 break;
-              }
-
-              // Is there a low surrogate following?
-              inputChar = input[charOff + inputSize];
-              if (Character.isLowSurrogate(inputChar)) {
-                 // We have a valid surrogate pair.  Too bad we don't do
-                 // surrogates.  Is substitution enabled?
-                 if (subMode) {
-                    if (subBytes.length == 1) {
-                       outputByte[0] = 0x00;
-                       outputByte[1] = subBytes[0];
-                    }
-                    else {
-                       outputByte[0] = subBytes[0];
-                       outputByte[1] = subBytes[1];
-                    }
-                    inputSize++;
-                 } else {
-                    badInputLength = 2;
-                    throw new UnknownCharacterException();
-                 }
-              } else {
-                 // We have a malformed surrogate pair
-                 badInputLength = 1;
-                 throw new MalformedInputException();
-              }
-           }
-           // Is this an unaccompanied low surrogate?
-           else if (Character.isLowSurrogate(inputChar)) {
-               badInputLength = 1;
-               throw new MalformedInputException();
-           } else {
-
-               // We have a valid character, get the bytes for it
-               theBytes = encodeChar(inputChar);
-               if (theBytes == UNMAPPABLE_ENCODING) {
-                   // if there was no mapping - look for substitution characters
-                   if (subMode) {
-                       if (subBytes.length == 1) {
-                           outputByte[0] = 0x00;
-                           outputByte[1] = subBytes[0];
-                       } else {
-                           outputByte[0] = subBytes[0];
-                           outputByte[1] = subBytes[1];
-                       }
-                   } else {
-                       badInputLength = 1;
-                       throw new UnknownCharacterException();
-                   }
-               } else {
-                   outputByte[0] = (byte)((theBytes & 0x0000ff00)>>8);
-                   outputByte[1] = (byte)(theBytes & 0x000000ff);
-               }
-           }
-
-           //Set the output buffer into the correct state
-
-           if (currentState == DBCS && outputByte[0] == 0x00) {
-              if (byteOff >= outEnd)
-                 throw new ConversionBufferFullException();
-              currentState = SBCS;
-              output[byteOff++] = SI;
-           } else
-              if (currentState == SBCS && outputByte[0] != 0x00) {
-                 if (byteOff >= outEnd) {
-                    throw new ConversionBufferFullException();
-                 }
-                 currentState = DBCS;
-                 output[byteOff++] = SO;
-              }
-
-           if (currentState == DBCS)
-              spaceNeeded = 2;
-           else
-              spaceNeeded = 1;
-
-           if (byteOff + spaceNeeded > outEnd) {
-              throw new ConversionBufferFullException();
-           }
-
-           if (currentState == SBCS)
-              output[byteOff++] = outputByte[1];
-           else {
-              output[byteOff++] = outputByte[0];
-              output[byteOff++] = outputByte[1];
-           }
-
-           charOff += inputSize;
-        }
-        return byteOff - outOff;
-    }
-
-
-
-    /**
-     * Resets converter to its initial state.
-     */
-    public void reset() {
-       charOff = byteOff = 0;
-       highHalfZoneCode = 0;
-       currentState = SBCS;
-    }
-
-
-    /**
-     * Returns the maximum number of bytes needed to convert a char.
-     */
-    public int getMaxBytesPerChar() {
-       return 4;    //Fixed with bug 4199599 so tests would pass.
-    }
-
-
-    /**
-     * Sets the substitution bytes to use when the converter is in
-     * substitution mode.  The given bytes should represent a valid
-     * character in the target character encoding.
-     */
-
-    public void setSubstitutionBytes( byte[] newSubBytes )
-       throws IllegalArgumentException
-    {
-       if( newSubBytes.length > 2 || newSubBytes.length == 0) {
-           throw new IllegalArgumentException();
-       }
-
-       subBytes = new byte[ newSubBytes.length ];
-       System.arraycopy( newSubBytes, 0, subBytes, 0, newSubBytes.length );
-
-    }
-
-    /**
-     * Returns true if the given character can be converted to the
-     * target character encoding.
-     */
-    public boolean canConvert(char c) {
-        return encodeChar(c) != UNMAPPABLE_ENCODING;
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteDoubleByte.java b/src/share/classes/sun/io/CharToByteDoubleByte.java
deleted file mode 100644
index d39fde7..0000000
--- a/src/share/classes/sun/io/CharToByteDoubleByte.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * @author Limin Shi
- */
-
-public abstract class CharToByteDoubleByte extends CharToByteConverter {
-
-    /*
-     * 1st level index, provided by subclass
-     */
-    protected short index1[];
-
-    /*
-     * 2nd level index, provided by subclass
-     */
-    protected String  index2[];
-
-    protected char highHalfZoneCode;
-
-    public short[] getIndex1() {
-        return index1;
-    }
-
-    public String[] getIndex2() {
-        return index2;
-    }
-
-    public int flush(byte[] output, int outStart, int outEnd)
-        throws MalformedInputException, ConversionBufferFullException
-    {
-        if (highHalfZoneCode != 0) {
-            highHalfZoneCode = 0;
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    /**
-     * Converts characters to sequences of bytes.
-     * Conversions that result in Exceptions can be restarted by calling
-     * convert again, with appropriately modified parameters.
-     * @return the characters written to output.
-     * @param input char array containing text in Unicode
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output byte array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last byte to be written to
-     * @throw UnsupportedCharacterException for any character
-     * that cannot be converted to the external character set.
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws MalformedInputException, UnknownCharacterException,
-               ConversionBufferFullException
-    {
-        char    inputChar;                 // Input character to be converted
-        byte[]  outputByte;                // Output byte written to output
-        int     inputSize = 0;             // Size of input
-        int     outputSize = 0;            // Size of output
-        byte[]  tmpbuf = new byte[2];
-
-        // Record beginning offsets
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (highHalfZoneCode != 0) {
-            inputChar = highHalfZoneCode;
-            highHalfZoneCode = 0;
-            if (input[inOff] >= 0xdc00 && input[inOff] <= 0xdfff) {
-                // This is legal UTF16 sequence.
-                badInputLength = 1;
-                throw new UnknownCharacterException();
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException();
-            }
-        }
-
-        // Loop until we hit the end of the input
-        while(charOff < inEnd) {
-            inputSize = 1;
-            outputByte = tmpbuf;
-            inputChar = input[charOff]; // Get the input character
-
-            // Is this a high surrogate?
-            if(inputChar >= '\uD800' && inputChar <= '\uDBFF') {
-                // Is this the last character of the input?
-                if (charOff + 1 >= inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-
-                // Is there a low surrogate following?
-                inputChar = input[charOff + 1];
-                if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                    // We have a valid surrogate pair.  Too bad we don't do
-                    // surrogates.  Is substitution enabled?
-                    if (subMode) {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                        inputSize = 2;
-                    } else {
-                        badInputLength = 2;
-                        throw new UnknownCharacterException();
-                    }
-                } else {
-                    // We have a malformed surrogate pair
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-            // Is this an unaccompanied low surrogate?
-            else if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            } else {
-                outputSize = convSingleByte(inputChar, outputByte);
-                if (outputSize == 0) { // DoubleByte
-                    int ncode = getNative(inputChar);
-                    if (ncode != 0 ) {
-                        outputByte[0] = (byte) ((ncode & 0xff00) >> 8);
-                        outputByte[1] = (byte) (ncode & 0xff);
-                        outputSize = 2;
-                    } else {
-                        if (subMode) {
-                            outputByte = subBytes;
-                            outputSize = subBytes.length;
-                        } else {
-                            badInputLength = 1;
-                            throw new UnknownCharacterException();
-                        }
-                    }
-                }
-            }
-
-            // If we don't have room for the output, throw an exception
-            if (byteOff + outputSize > outEnd)
-                throw new ConversionBufferFullException();
-
-            // Put the byte in the output buffer
-            for (int i = 0; i < outputSize; i++) {
-                output[byteOff++] = outputByte[i];
-            }
-            charOff += inputSize;
-        }
-        // Return the length written to the output buffer
-        return byteOff - outOff;
-    }
-
-
-    /**
-     * the maximum number of bytes needed to hold a converted char
-     * @returns the maximum number of bytes needed for a converted char
-     */
-    public int getMaxBytesPerChar() {
-        return 2;
-    }
-
-    /**
-     *  Resets the converter.
-     * Call this method to reset the converter to its initial state
-     */
-    public void reset() {
-        byteOff = charOff = 0;
-        highHalfZoneCode = 0;
-    }
-
-    /**
-     * Return whether a character is mappable or not
-     * @return true if a character is mappable
-     */
-    public boolean canConvert(char ch) {
-        byte[] outByte = new byte[2];
-
-        if ((ch == (char) 0) || (convSingleByte(ch, outByte) != 0))
-            return true;
-        if (this.getNative(ch) != 0)
-            return true;
-        return false;
-    }
-
-
-    /*
-     * Can be changed by subclass
-     */
-    protected int convSingleByte(char inputChar, byte[] outputByte) {
-        if (inputChar < 0x80) {
-            outputByte[0] = (byte)(inputChar & 0x7f);
-            return 1;
-        }
-        return 0;
-    }
-
-    /*
-     * Can be changed by subclass
-     */
-    protected int getNative(char ch) {
-        int offset = index1[((ch & 0xff00) >> 8 )] << 8;
-        return index2[offset >> 12].charAt((offset & 0xfff) + (ch & 0xff));
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteEUC.java b/src/share/classes/sun/io/CharToByteEUC.java
deleted file mode 100644
index dd02692..0000000
--- a/src/share/classes/sun/io/CharToByteEUC.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-public abstract class CharToByteEUC extends CharToByteConverter
-{
-
-    private char highHalfZoneCode;
-    private byte[] outputByte;
-
-    protected short  index1[];
-    protected String index2;
-    protected String index2a;
-    protected String index2b;
-    protected String index2c;
-    protected int    mask1;
-    protected int    mask2;
-    protected int    shift;
-
-    private byte[] workByte = new byte[4];
-
-    /**
-      * flush out any residual data and reset the buffer state
-      */
-    public int flush(byte [] output, int outStart, int outEnd)
-        throws MalformedInputException, ConversionBufferFullException
-    {
-
-       if (highHalfZoneCode != 0) {
-          reset();
-          badInputLength = 0;
-          throw new MalformedInputException();
-       }
-
-       reset();
-       return 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        char    inputChar;
-        int     inputSize;
-
-        byteOff = outOff;
-        charOff = inOff;
-
-        while(charOff < inEnd) {
-
-           outputByte = workByte;
-
-           int     index;
-           int     theBytes;
-           int     spaceNeeded;
-           boolean allZeroes = true;
-           int     i;
-
-
-           if (highHalfZoneCode == 0) {
-              inputChar = input[charOff];
-              inputSize = 1;
-           } else {
-              inputChar = highHalfZoneCode;
-              inputSize = 0;
-              highHalfZoneCode = 0;
-           }
-
-
-           // Is this a high surrogate?
-           if(inputChar >= '\ud800' && inputChar <= '\udbff') {
-              // Is this the last character of the input?
-              if (charOff + inputSize >= inEnd) {
-                 highHalfZoneCode = inputChar;
-                 charOff += inputSize;
-                 break;
-              }
-
-              // Is there a low surrogate following?
-              inputChar = input[charOff + inputSize];
-              if (inputChar >= '\udc00' && inputChar <= '\udfff') {
-
-                 // We have a valid surrogate pair.  Too bad we don't do
-                 // surrogates.  Is substitution enabled?
-                 if (subMode) {
-                    outputByte = subBytes;
-                    inputSize++;
-                 } else {
-                    badInputLength = 2;
-                    throw new UnknownCharacterException();
-                 }
-              } else {
-
-                 // We have a malformed surrogate pair
-                 badInputLength = 1;
-                 throw new MalformedInputException();
-              }
-           }
-
-           // Is this an unaccompanied low surrogate?
-           else
-              if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                 badInputLength = 1;
-                 throw new MalformedInputException();
-              } else {
-
-                 String theChars;
-                 char   aChar;
-
-                 // We have a valid character, get the bytes for it
-                 index = index1[((inputChar & mask1) >> shift)] + (inputChar & mask2);
-
-                 if (index < 7500)
-                   theChars = index2;
-                 else
-                   if (index < 15000) {
-                     index = index - 7500;
-                     theChars = index2a;
-                   }
-                   else
-                     if (index < 22500){
-                       index = index - 15000;
-                       theChars = index2b;
-                     }
-                     else {
-                       index = index - 22500;
-                       theChars = index2c;
-                     }
-
-                 aChar = theChars.charAt(2*index);
-                 outputByte[0] = (byte)((aChar & 0xff00)>>8);
-                 outputByte[1] = (byte)(aChar & 0x00ff);
-                 aChar = theChars.charAt(2*index + 1);
-                 outputByte[2] = (byte)((aChar & 0xff00)>>8);
-                 outputByte[3] = (byte)(aChar & 0x00ff);
-              }
-
-           // if there was no mapping - look for substitution characters
-
-           for (i = 0; i < outputByte.length; i++) {
-             if (outputByte[i] != 0x00) {
-               allZeroes = false;
-               break;
-             }
-           }
-
-           if (allZeroes && inputChar != '\u0000')
-           {
-              if (subMode) {
-                 outputByte = subBytes;
-              } else {
-                badInputLength = 1;
-                throw new UnknownCharacterException();
-              }
-           }
-
-           int oindex = 0;
-           for (spaceNeeded = outputByte.length; spaceNeeded > 1; spaceNeeded--){
-             if (outputByte[oindex++] != 0x00 )
-               break;
-           }
-
-           if (byteOff + spaceNeeded > outEnd)
-              throw new ConversionBufferFullException();
-
-
-           for (i = outputByte.length - spaceNeeded; i < outputByte.length; i++) {
-              output[byteOff++] = outputByte[i];
-           }
-
-           charOff += inputSize;
-        }
-
-        return byteOff - outOff;
-    }
-
-    /**
-     * Resets converter to its initial state.
-     */
-    public void reset() {
-       charOff = byteOff = 0;
-       highHalfZoneCode = 0;
-    }
-
-    /**
-     * Returns the maximum number of bytes needed to convert a char.
-     */
-    public int getMaxBytesPerChar() {
-        return 2;
-    }
-
-
-    /**
-     * Returns true if the given character can be converted to the
-     * target character encoding.
-     */
-    public boolean canConvert(char ch) {
-       int    index;
-       String theChars;
-
-       index = index1[((ch & mask1) >> shift)] + (ch & mask2);
-
-       if (index < 7500)
-         theChars = index2;
-       else
-         if (index < 15000) {
-           index = index - 7500;
-           theChars = index2a;
-         }
-         else
-           if (index < 22500){
-             index = index - 15000;
-             theChars = index2b;
-           }
-           else {
-             index = index - 22500;
-             theChars = index2c;
-           }
-
-       if (theChars.charAt(2*index) != '\u0000' ||
-                    theChars.charAt(2*index + 1) != '\u0000')
-         return (true);
-
-       // only return true if input char was unicode null - all others are
-       //     undefined
-       return( ch == '\u0000');
-
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteEUC_CN.java b/src/share/classes/sun/io/CharToByteEUC_CN.java
deleted file mode 100644
index aa286b0..0000000
--- a/src/share/classes/sun/io/CharToByteEUC_CN.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteEUC_CN extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new EUC_CN().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "EUC_CN";
-    }
-
-    public CharToByteEUC_CN() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteEUC_JP.java b/src/share/classes/sun/io/CharToByteEUC_JP.java
deleted file mode 100644
index 797c9e7..0000000
--- a/src/share/classes/sun/io/CharToByteEUC_JP.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * @author Limin Shi
- */
-
-public class CharToByteEUC_JP extends CharToByteJIS0208 {
-    CharToByteJIS0201 cbJIS0201 = new CharToByteJIS0201();
-    CharToByteJIS0212 cbJIS0212 = new CharToByteJIS0212();
-
-    public String getCharacterEncoding() {
-        return "EUC_JP";
-    }
-
-    protected int convSingleByte(char inputChar, byte[] outputByte) {
-        byte b;
-
-        if (inputChar == 0) {
-            outputByte[0] = (byte)0;
-            return 1;
-        }
-
-        if ((b = cbJIS0201.getNative(inputChar)) == 0)
-            return 0;
-
-        if (b > 0 && b < 128) {
-            outputByte[0] = b;
-            return 1;
-        }
-        outputByte[0] = (byte)0x8E;
-        outputByte[1] = b;
-        return 2;
-    }
-
-    protected int getNative(char ch) {
-        int offset = index1[((ch & 0xff00) >> 8 )] << 8;
-        int r = index2[offset >> 12].charAt((offset & 0xfff) + (ch & 0xff));
-        if (r != 0)
-            return r + 0x8080;
-        r = cbJIS0212.getNative(ch);
-        if (r == 0)
-            return r;
-        return r + 0x8F8080;
-    }
-
-
-    /**
-     * Converts characters to sequences of bytes.
-     * Conversions that result in Exceptions can be restarted by calling
-     * convert again, with appropriately modified parameters.
-     * @return the characters written to output.
-     * @param input char array containing text in Unicode
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output byte array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last byte to be written to
-     * @throw UnsupportedCharacterException for any character
-     * that cannot be converted to the external character set.
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws MalformedInputException, UnknownCharacterException,
-               ConversionBufferFullException
-    {
-        char    inputChar;                 // Input character to be converted
-        byte[]  outputByte;                // Output byte written to output
-        int     inputSize = 0;             // Size of input
-        int     outputSize = 0;            // Size of output
-        byte[]  tmpbuf = new byte[4];
-
-        // Record beginning offsets
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (highHalfZoneCode != 0) {
-            inputChar = highHalfZoneCode;
-            highHalfZoneCode = 0;
-            if (input[inOff] >= 0xdc00 && input[inOff] <= 0xdfff) {
-                // This is legal UTF16 sequence.
-                badInputLength = 1;
-                throw new UnknownCharacterException();
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException();
-            }
-        }
-
-        // Loop until we hit the end of the input
-        while(charOff < inEnd) {
-            inputSize = 1;
-            outputByte = tmpbuf;
-            inputChar = input[charOff]; // Get the input character
-
-            // Is this a high surrogate?
-            if(inputChar >= '\uD800' && inputChar <= '\uDBFF') {
-                // Is this the last character of the input?
-                if (charOff + 1 >= inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-
-                // Is there a low surrogate following?
-                inputChar = input[charOff + 1];
-                if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                    // We have a valid surrogate pair.  Too bad we don't do
-                    // surrogates.  Is substitution enabled?
-                    if (subMode) {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                        inputSize = 2;
-                    } else {
-                        badInputLength = 2;
-                        throw new UnknownCharacterException();
-                    }
-                } else {
-                    // We have a malformed surrogate pair
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-            // Is this an unaccompanied low surrogate?
-            else if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            } else {
-                outputSize = convSingleByte(inputChar, outputByte);
-                if (outputSize == 0) { // DoubleByte
-                    int ncode = getNative(inputChar);
-                    if (ncode != 0 ) {
-                        if ((ncode & 0xFF0000) == 0) {
-                            outputByte[0] = (byte) ((ncode & 0xff00) >> 8);
-                            outputByte[1] = (byte) (ncode & 0xff);
-                            outputSize = 2;
-                        } else {
-                            outputByte[0] = (byte) 0x8F;
-                            outputByte[1] = (byte) ((ncode & 0xff00) >> 8);
-                            outputByte[2] = (byte) (ncode & 0xff);
-                            outputSize = 3;
-                        }
-                    } else {
-                        if (subMode) {
-                            outputByte = subBytes;
-                            outputSize = subBytes.length;
-                        } else {
-                            badInputLength = 1;
-                            throw new UnknownCharacterException();
-                        }
-                    }
-                }
-            }
-
-            // If we don't have room for the output, throw an exception
-            if (byteOff + outputSize > outEnd)
-                throw new ConversionBufferFullException();
-
-            // Put the byte in the output buffer
-            for (int i = 0; i < outputSize; i++) {
-                output[byteOff++] = outputByte[i];
-            }
-            charOff += inputSize;
-        }
-        // Return the length written to the output buffer
-        return byteOff - outOff;
-    }
-
-
-    /**
-     * the maximum number of bytes needed to hold a converted char
-     * @returns the maximum number of bytes needed for a converted char
-     */
-    public int getMaxBytesPerChar() {
-        return 3;
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteEUC_JP_LINUX.java b/src/share/classes/sun/io/CharToByteEUC_JP_LINUX.java
deleted file mode 100644
index dc0c0dc..0000000
--- a/src/share/classes/sun/io/CharToByteEUC_JP_LINUX.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * Class for converting characters to bytes for the EUC-JP encoding in
- * linux. This converter supports the JIS0201 and the JIS0208 encoding and
- * omits support for the JIS212 encoding.
- *
- * @author Naveen Sanjeeva
- */
-
-public class CharToByteEUC_JP_LINUX extends CharToByteJIS0208 {
-    CharToByteJIS0201 cbJIS0201 = new CharToByteJIS0201();
-
-    public String getCharacterEncoding() {
-        return "EUC_JP_LINUX";
-    }
-
-    protected int convSingleByte(char inputChar, byte[] outputByte) {
-        byte b;
-
-        if (inputChar == 0) {
-            outputByte[0] = (byte)0;
-            return 1;
-        }
-
-        if ((b = cbJIS0201.getNative(inputChar)) == 0)
-            return 0;
-
-        if (b > 0 && b < 128) {
-            outputByte[0] = b;
-            return 1;
-        }
-        outputByte[0] = (byte)0x8E;
-        outputByte[1] = b;
-        return 2;
-    }
-
-    protected int getNative(char ch) {
-        int offset = index1[((ch & 0xff00) >> 8 )] << 8;
-        int r = index2[offset >> 12].charAt((offset & 0xfff) + (ch & 0xff));
-        if (r != 0)
-            return r + 0x8080;
-        return r;
-    }
-
-    /**
-     * Converts characters to sequences of bytes.
-     * Conversions that result in Exceptions can be restarted by calling
-     * convert again, with appropriately modified parameters.
-     * @return the characters written to output.
-     * @param input char array containing text in Unicode
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output byte array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last byte to be written to
-     * @throw UnsupportedCharacterException for any character
-     * that cannot be converted to the external character set.
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws MalformedInputException, UnknownCharacterException,
-               ConversionBufferFullException
-    {
-        char    inputChar;                 // Input character to be converted
-        byte[]  outputByte;                // Output byte written to output
-        int     inputSize = 0;             // Size of input
-        int     outputSize = 0;            // Size of output
-        byte[]  tmpbuf = new byte[4];
-
-        // Record beginning offsets
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (highHalfZoneCode != 0) {
-            inputChar = highHalfZoneCode;
-            highHalfZoneCode = 0;
-            if (input[inOff] >= 0xdc00 && input[inOff] <= 0xdfff) {
-                // This is legal UTF16 sequence.
-                badInputLength = 1;
-                throw new UnknownCharacterException();
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException();
-            }
-        }
-
-        // Loop until we hit the end of the input
-        while(charOff < inEnd) {
-            inputSize = 1;
-            outputByte = tmpbuf;
-            inputChar = input[charOff]; // Get the input character
-
-            // Is this a high surrogate?
-            if(inputChar >= '\uD800' && inputChar <= '\uDBFF') {
-                // Is this the last character of the input?
-                if (charOff + 1 >= inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-
-                // Is there a low surrogate following?
-                inputChar = input[charOff + 1];
-                if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                    // We have a valid surrogate pair.  Too bad we don't do
-                    // surrogates.  Is substitution enabled?
-                    if (subMode) {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                        inputSize = 2;
-                    } else {
-                        badInputLength = 2;
-                        throw new UnknownCharacterException();
-                    }
-                } else {
-                    // We have a malformed surrogate pair
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-            // Is this an unaccompanied low surrogate?
-            else if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            } else {
-                outputSize = convSingleByte(inputChar, outputByte);
-                if (outputSize == 0) { // DoubleByte
-                    int ncode = getNative(inputChar);
-                    if (ncode != 0 && ((ncode & 0xFF0000) == 0)) {
-                            outputByte[0] = (byte) ((ncode & 0xff00) >> 8);
-                            outputByte[1] = (byte) (ncode & 0xff);
-                            outputSize = 2;
-                    } else {
-                        if (subMode) {
-                            outputByte = subBytes;
-                            outputSize = subBytes.length;
-                        } else {
-                            badInputLength = 1;
-                            throw new UnknownCharacterException();
-                        }
-                    }
-                }
-            }
-
-            // If we don't have room for the output, throw an exception
-            if (byteOff + outputSize > outEnd)
-                throw new ConversionBufferFullException();
-
-            // Put the byte in the output buffer
-            for (int i = 0; i < outputSize; i++) {
-                output[byteOff++] = outputByte[i];
-            }
-            charOff += inputSize;
-        }
-        // Return the length written to the output buffer
-        return byteOff - outOff;
-    }
-
-
-    /**
-     * the maximum number of bytes needed to hold a converted char
-     * @returns the maximum number of bytes needed for a converted char
-     */
-    public int getMaxBytesPerChar() {
-        return 2;
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteEUC_JP_Solaris.java b/src/share/classes/sun/io/CharToByteEUC_JP_Solaris.java
deleted file mode 100644
index 73337d5..0000000
--- a/src/share/classes/sun/io/CharToByteEUC_JP_Solaris.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0208_Solaris_Encoder;
-import sun.nio.cs.ext.JIS_X_0212_Solaris_Encoder;
-
-/**
- * @author Limin Shi
- * @author Ian Little
- *
- * EUC_JP variant converter for Solaris with vendor defined chars
- * added (4765370)
- */
-
-public class CharToByteEUC_JP_Solaris extends CharToByteEUC_JP {
-    CharToByteJIS0201 cbJIS0201 = new CharToByteJIS0201();
-    CharToByteJIS0212_Solaris cbJIS0212 = new CharToByteJIS0212_Solaris();
-
-    short[] j0208Index1 = JIS_X_0208_Solaris_Encoder.getIndex1();
-    String[] j0208Index2 = JIS_X_0208_Solaris_Encoder.getIndex2();
-
-    public String getCharacterEncoding() {
-        return "eucJP-open";
-    }
-
-    protected int convSingleByte(char inputChar, byte[] outputByte) {
-        byte b;
-
-        if (inputChar == 0) {
-            outputByte[0] = (byte)0;
-            return 1;
-        }
-
-        if ((b = cbJIS0201.getNative(inputChar)) == 0)
-            return 0;
-
-        if (b > 0 && b < 128) {
-            outputByte[0] = b;
-            return 1;
-        }
-        outputByte[0] = (byte)0x8E;
-        outputByte[1] = b;
-        return 2;
-    }
-
-    protected int getNative(char ch) {
-        int r = super.getNative(ch);
-        if (r != 0) {
-            return r;
-        } else {
-            int offset = j0208Index1[((ch & 0xff00) >> 8 )] << 8;
-            r = j0208Index2[offset >> 12].charAt((offset & 0xfff) + (ch & 0xff));
-            if (r > 0x7500)
-                return 0x8f8080 + cbJIS0212.getNative(ch);
-        }
-        return (r == 0)? r : r + 0x8080;
-    }
-
-
-    /**
-     * Converts characters to sequences of bytes.
-     * Conversions that result in Exceptions can be restarted by calling
-     * convert again, with appropriately modified parameters.
-     * @return the characters written to output.
-     * @param input char array containing text in Unicode
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output byte array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last byte to be written to
-     * @throw UnsupportedCharacterException for any character
-     * that cannot be converted to the external character set.
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws MalformedInputException, UnknownCharacterException,
-               ConversionBufferFullException
-    {
-        char    inputChar;                 // Input character to be converted
-        byte[]  outputByte;                // Output byte written to output
-        int     inputSize = 0;             // Size of input
-        int     outputSize = 0;            // Size of output
-        byte[]  tmpbuf = new byte[4];
-
-        // Record beginning offsets
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (highHalfZoneCode != 0) {
-            inputChar = highHalfZoneCode;
-            highHalfZoneCode = 0;
-            if (input[inOff] >= 0xdc00 && input[inOff] <= 0xdfff) {
-                // This is legal UTF16 sequence.
-                badInputLength = 1;
-                throw new UnknownCharacterException();
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException();
-            }
-        }
-
-        // Loop until we hit the end of the input
-        while(charOff < inEnd) {
-            inputSize = 1;
-            outputByte = tmpbuf;
-            inputChar = input[charOff]; // Get the input character
-
-            // Is this a high surrogate?
-            if(inputChar >= '\uD800' && inputChar <= '\uDBFF') {
-                // Is this the last character of the input?
-                if (charOff + 1 >= inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-
-                // Is there a low surrogate following?
-                inputChar = input[charOff + 1];
-                if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                    // We have a valid surrogate pair.  Too bad we don't do
-                    // surrogates.  Is substitution enabled?
-                    if (subMode) {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                        inputSize = 2;
-                    } else {
-                        badInputLength = 2;
-                        throw new UnknownCharacterException();
-                    }
-                } else {
-                    // We have a malformed surrogate pair
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-            // Is this an unaccompanied low surrogate?
-            else if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            } else {
-                outputSize = convSingleByte(inputChar, outputByte);
-                if (outputSize == 0) { // DoubleByte
-                    int ncode = getNative(inputChar);
-                    if (ncode != 0 ) {
-                        if ((ncode & 0xFF0000) == 0) {
-                            outputByte[0] = (byte) ((ncode & 0xff00) >> 8);
-                            outputByte[1] = (byte) (ncode & 0xff);
-                            outputSize = 2;
-                        } else {
-                            outputByte[0] = (byte) 0x8F;
-                            outputByte[1] = (byte) ((ncode & 0xff00) >> 8);
-                            outputByte[2] = (byte) (ncode & 0xff);
-                            outputSize = 3;
-                        }
-                    } else {
-                        if (subMode) {
-                            outputByte = subBytes;
-                            outputSize = subBytes.length;
-                        } else {
-                            badInputLength = 1;
-                            throw new UnknownCharacterException();
-                        }
-                    }
-                }
-            }
-
-            // If we don't have room for the output, throw an exception
-            if (byteOff + outputSize > outEnd)
-                throw new ConversionBufferFullException();
-
-            // Put the byte in the output buffer
-            for (int i = 0; i < outputSize; i++) {
-                output[byteOff++] = outputByte[i];
-            }
-            charOff += inputSize;
-        }
-        // Return the length written to the output buffer
-        return byteOff - outOff;
-    }
-
-
-    /**
-     * the maximum number of bytes needed to hold a converted char
-     * @returns the maximum number of bytes needed for a converted char
-     */
-    public int getMaxBytesPerChar() {
-        return 3;
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteEUC_KR.java b/src/share/classes/sun/io/CharToByteEUC_KR.java
deleted file mode 100644
index 9796ebe..0000000
--- a/src/share/classes/sun/io/CharToByteEUC_KR.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteEUC_KR extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new EUC_KR().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "EUC_KR";
-    }
-
-    public CharToByteEUC_KR() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteEUC_TW.java b/src/share/classes/sun/io/CharToByteEUC_TW.java
deleted file mode 100644
index a8d46eb..0000000
--- a/src/share/classes/sun/io/CharToByteEUC_TW.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.EUC_TW;
-
-/*
- * @author Limin Shi
- */
-
-public class CharToByteEUC_TW extends CharToByteConverter
-{
-    private final EUC_TW.Encoder enc = (EUC_TW.Encoder)(new EUC_TW().newEncoder());
-
-    public int flush(byte[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        reset();
-        return 0;
-    }
-
-    public void reset() {
-        byteOff = charOff = 0;
-    }
-
-    public boolean canConvert(char ch){
-        return enc.canEncode(ch);
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        int outputSize;
-        byte [] tmpbuf = new byte[4];;
-        byte [] outputByte;
-        byteOff = outOff;
-
-        //Fixed 4122961 by bringing the charOff++ out to this
-        // loop where it belongs, changing the loop from
-        // while(){} to for(){}.
-        for (charOff = inOff; charOff < inEnd; charOff++) {
-            outputByte = tmpbuf;
-            if ( input[charOff] < 0x80) {       // ASCII
-                outputSize = 1;
-                outputByte[0] = (byte)(input[charOff] & 0x7f);
-            } else {
-                outputSize = enc.toEUC(input[charOff], outputByte);
-            }
-
-            if (outputSize == -1) {
-                if (subMode) {
-                    outputByte = subBytes;
-                    outputSize = subBytes.length;
-                } else {
-                    badInputLength = 1;
-                    throw new UnknownCharacterException();
-                }
-            }
-
-            if (outEnd - byteOff < outputSize)
-                throw new ConversionBufferFullException();
-
-            for (int i = 0; i < outputSize; i++)
-                output[byteOff++] = outputByte[i];
-        }
-
-        return byteOff - outOff;
-
-    }
-
-    /**
-     * returns the maximum number of bytes needed to convert a char
-     */
-    public int getMaxBytesPerChar() {
-        return 4;
-    }
-
-    /**
-     * Return the character set ID
-     */
-    public String getCharacterEncoding() {
-        return "EUC_TW";
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteGB18030.java b/src/share/classes/sun/io/CharToByteGB18030.java
deleted file mode 100644
index 0dce04d..0000000
--- a/src/share/classes/sun/io/CharToByteGB18030.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- */
-
-
-package sun.io;
-import sun.nio.cs.ext.GB18030;
-
-public class CharToByteGB18030 extends CharToByteConverter
-{
-
-    private char highHalfZoneCode;
-    boolean flushed = true;
-
-    private final static int GB18030_SINGLE_BYTE = 1;
-    private final static int GB18030_DOUBLE_BYTE = 2;
-    private final static int GB18030_FOUR_BYTE = 3;
-    private static short[] index1;
-    private static String[] index2;
-    private int currentState;
-
-    public CharToByteGB18030() {
-        GB18030 nioCoder = new GB18030();
-        currentState = GB18030_DOUBLE_BYTE;
-        subBytes = new byte[1];
-        subBytes[0] = (byte)'?';
-        index1 = nioCoder.getEncoderIndex1();
-        index2 = nioCoder.getEncoderIndex2();
-    }
-
-    public int flush(byte[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (highHalfZoneCode != 0) {
-            highHalfZoneCode = 0;
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        reset();
-        flushed = true;
-        return 0;
-    }
-
-    public void reset() {
-        byteOff = charOff = 0;
-        currentState = GB18030_DOUBLE_BYTE;
-    }
-
-    public boolean canConvert(char c) {
-        // converts all but unpaired surrogates
-        // and illegal chars, U+FFFE & U+FFFF
-
-        if ((c >= 0xd800 && c <=0xdfff) || (c >= 0xfffe))
-            return false;
-        else
-            return true;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        int linearDiffValue = 0;
-        int hiByte = 0 , loByte = 0;  // low and high order bytes
-        char inputChar;  // Input character to be converted
-        charOff = inOff;
-        byteOff = outOff;
-        int inputSize;  // Size of the input
-        int outputSize; // Size of the output
-
-        flushed = false;
-
-        if (highHalfZoneCode != 0) {
-            if (input[inOff] >= 0xDC00 && input[inOff] <= 0xDFFF) {
-
-                // This is legal UTF16 sequence, so shunt in the high
-                // surrogate for conversion by convert() loop.
-
-                char[] newBuf = new char[inEnd - inOff + 1];
-                newBuf[0] = highHalfZoneCode;
-                System.arraycopy(input, inOff, newBuf, 1, inEnd - inOff);
-                charOff -= 1;
-                input = newBuf;
-                inOff = 0;
-                inEnd = newBuf.length;
-                highHalfZoneCode = 0;
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException();
-            }
-        }
-
-        // Main encode loop
-
-        while (charOff < inEnd) {
-            inputChar = input[charOff++];
-
-            if(inputChar >= '\uD800' && inputChar <= '\uDBFF') {
-                // Is this the last character of the input?
-                if (charOff + 1 > inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-
-                char previousChar = inputChar;
-                inputChar = input[charOff];
-
-                // Is there a low surrogate following?
-                if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                    inputSize = 2;
-                    charOff++;
-                    linearDiffValue = ( previousChar - 0xD800) * 0x400 +
-                                ( inputChar - 0xDC00) + 0x2E248;
-
-                    currentState = GB18030_FOUR_BYTE;
-                } else {
-                    // We have a malformed surrogate pair
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-            // Is this an unaccompanied low surrogate?
-            else if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            }
-
-            // Not part of a surrogate
-            else if (inputChar >= 0x0000 && inputChar <= 0x007F) {
-                if (byteOff >= outEnd) {
-                   throw new ConversionBufferFullException();
-                }
-                currentState = GB18030_SINGLE_BYTE;
-                output[byteOff++] = (byte) inputChar;
-            }
-            else if (inputChar <= 0xA4C6 || inputChar >= 0xE000) {
-                int outByteVal = getGB18030(index1, index2, inputChar);
-
-                if (outByteVal == 0xFFFD ) {
-                    if (subMode) {
-                        if (byteOff >= outEnd) {
-                           throw new ConversionBufferFullException();
-                        } else {
-                            output[byteOff++] = subBytes[0];
-                            continue;
-                        }
-                    } else {
-                        badInputLength = 1;
-                        throw new UnknownCharacterException();
-                    }
-                }
-
-                hiByte = (outByteVal & 0xFF00) >> 8;
-                loByte = (outByteVal & 0xFF);
-
-                linearDiffValue = (hiByte - 0x20) * 256 + loByte;
-
-                if (inputChar >= 0xE000 && inputChar < 0xF900)
-                        linearDiffValue += 0x82BD;
-                else if (inputChar >= 0xF900)
-                        linearDiffValue += 0x93A9;
-
-                if (hiByte > 0x80)
-                     currentState = GB18030_DOUBLE_BYTE;
-                else
-                     currentState = GB18030_FOUR_BYTE;
-            }
-            else if (inputChar >= 0xA4C7 && inputChar <= 0xD7FF) {
-                linearDiffValue = inputChar - 0x5543;
-                currentState = GB18030_FOUR_BYTE;
-            }
-            else {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            }
-
-            if (currentState == GB18030_SINGLE_BYTE)
-                continue;
-
-            if (currentState == GB18030_DOUBLE_BYTE) {
-                if (byteOff + 2 > outEnd) {
-                    throw new ConversionBufferFullException();
-                }
-                output[byteOff++] = (byte)hiByte;
-                output[byteOff++] = (byte)loByte;
-            }
-            else { // Four Byte encoding
-                if (byteOff + 4 > outEnd) {
-                    throw new ConversionBufferFullException();
-                }
-
-                byte b1, b2, b3, b4;
-
-                b4 = (byte)((linearDiffValue % 10) + 0x30);
-                linearDiffValue /= 10;
-                b3 = (byte)((linearDiffValue % 126) + 0x81);
-                linearDiffValue /= 126;
-                b2 = (byte)((linearDiffValue % 10) + 0x30);
-                b1 = (byte)((linearDiffValue / 10) + 0x81);
-                output[byteOff++] = b1;
-                output[byteOff++] = b2;
-                output[byteOff++] = b3;
-                output[byteOff++] = b4;
-            }
-        }
-        // Return number of bytes written to the output buffer.
-        return byteOff - outOff;
-    }
-
-
-    /**
-     * returns the maximum number of bytes needed to convert a char
-     */
-    public int getMaxBytesPerChar() {
-        return 4;
-    }
-
-
-    /**
-     * Return the character set ID
-     */
-    public String getCharacterEncoding() {
-        return "GB18030";
-    }
-
-    private int getGB18030(short[] outerIndex, String[] innerIndex, char ch) {
-        int offset = outerIndex[((ch & 0xff00) >> 8 )] << 8;
-
-        return innerIndex[offset >> 12].charAt((offset & 0xfff) + (ch & 0xff));
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteGBK.java b/src/share/classes/sun/io/CharToByteGBK.java
deleted file mode 100644
index 85beef0..0000000
--- a/src/share/classes/sun/io/CharToByteGBK.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteGBK extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new GBK().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "GBK";
-    }
-
-    public CharToByteGBK() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISCII91.java b/src/share/classes/sun/io/CharToByteISCII91.java
deleted file mode 100644
index b500aaa..0000000
--- a/src/share/classes/sun/io/CharToByteISCII91.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.ISCII91;
-
-/*
- * Copyright (c) 1998 International Business Machines.
- * All Rights Reserved.
- *
- * Author : Sunanda Bera, C. Thirumalesh
- * Last Modified : 11,December,1998
- *
- * Purpose : Defines class CharToByteISCII91.
- *
- *
- * Revision History
- * ======== =======
- *
- * Date        By            Description
- * ----        --            -----------
- * March 29, 1999 John Raley Removed MalformedInputException; modified substitution logic
- *
- */
-
-/**
- * Converter class. Converts between ISCII91 encoding and Unicode encoding.
- * ISCII91 is the character encoding as defined in Indian Standard document
- * IS 13194:1991 ( Indian Script Code for Information Interchange ).
- *
- * @see sun.io.CharToByteConverter
- */
-
-/*
- * {jbr} I am not sure this class adheres to code converter conventions.
- * Need to investigate.
- * Might should recode as a subclass of CharToByteSingleByte.
- */
-
-public class CharToByteISCII91 extends CharToByteConverter {
-
-        private static final byte NO_CHAR = (byte)255;
-
-        //private final static ISCII91 nioCoder = new ISCII91();
-        private final static byte[] directMapTable = ISCII91.getEncoderMappingTable();
-
-        private static final char NUKTA_CHAR = '\u093c';
-        private static final char HALANT_CHAR = '\u094d';
-
-
-/**
- * @return true for Devanagari and ASCII range and for the special characters
- *              Zero Width Joiner and Zero Width Non-Joiner
- * @see sun.io.CharToByteConverter#canConvert
- *
- */
-        public boolean canConvert(char ch) {
-        //check for Devanagari range,ZWJ,ZWNJ and ASCII range.
-        return ((ch >= 0x0900 && ch <= 0x097f) || (ch == 0x200d || ch == 0x200c)
-                                || (ch >= 0x0000 && ch <= 0x007f) );
-        } //canConvert()
-/**
- * Converts both Devanagari and ASCII range of characters.
- * @see sun.io.CharToByteConverter#convert
- */
-    public int convert(char[] input, int inStart, int inEnd, byte[] output, int outStart, int outEnd) throws MalformedInputException, UnknownCharacterException, ConversionBufferFullException {
-
-        charOff = inStart;
-        byteOff = outStart;
-
-        for (;charOff < inEnd; charOff++) {
-
-            char inputChar = input[charOff];
-            int index = Integer.MIN_VALUE;
-            boolean isSurrogatePair = false;
-
-            //check if input is in ASCII RANGE
-            if (inputChar >= 0x0000 && inputChar <= 0x007f) {
-                if (byteOff >= outEnd) {
-                        throw new ConversionBufferFullException();
-                }
-                output[byteOff++] = (byte) inputChar;
-                continue;
-            }
-
-            // if inputChar == ZWJ replace it with halant
-            // if inputChar == ZWNJ replace it with Nukta
-            if (inputChar == 0x200c) {
-                inputChar = HALANT_CHAR;
-            }
-            else if (inputChar == 0x200d) {
-                inputChar = NUKTA_CHAR;
-            }
-
-            if (inputChar >= 0x0900 && inputChar <= 0x097f) {
-                index = ((int)(inputChar) - 0x0900)*2;
-            }
-
-            // If input char is a high surrogate, ensure that the following
-            // char is a low surrogate.  If not, throw a MalformedInputException.
-            // Leave index untouched so substitution or an UnknownCharacterException
-            // will result.
-            else if (inputChar >= 0xd800 && inputChar <= 0xdbff) {
-                if (charOff < inEnd-1) {
-                    char nextChar = input[charOff];
-                    if (nextChar >= 0xdc00 && nextChar <= 0xdfff) {
-                        charOff++;
-                        isSurrogatePair = true;
-                    }
-                }
-                if (!isSurrogatePair) {
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-            else if (inputChar >= 0xdc00 && inputChar <= 0xdfff) {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            }
-
-            if (index == Integer.MIN_VALUE || directMapTable[index] == NO_CHAR) {
-                if (subMode) {
-                    if (byteOff + subBytes.length >= outEnd) {
-                            throw new ConversionBufferFullException();
-                    }
-                    System.arraycopy(subBytes, 0, output, byteOff, subBytes.length);
-                    byteOff += subBytes.length;
-                } else {
-                    badInputLength = isSurrogatePair? 2 : 1;
-                    throw new UnknownCharacterException();
-                }
-            }
-            else {
-                if(byteOff >= outEnd) {
-                    throw new ConversionBufferFullException();
-                }
-                output[byteOff++] = directMapTable[index++];
-                if(directMapTable[index] != NO_CHAR) {
-                    if(byteOff >= outEnd) {
-                            throw new ConversionBufferFullException();
-                    }
-                    output[byteOff++] = directMapTable[index];
-                }
-            }
-
-        } //end for
-
-        return byteOff - outStart;
-    } //end of routine convert.
-
-/**
-* @see sun.io.CharToByteConverter#flush
-*/
-        public int flush( byte[] output, int outStart, int outEnd )
-        throws MalformedInputException, ConversionBufferFullException {
-        byteOff = charOff = 0;
-        return 0;
-        }//flush()
-/**
- * @return The character encoding as a String.
- */
-        public String getCharacterEncoding() {
-        return "ISCII91";
-        }//getCharacterEncoding
-/**
- * @see sun.io.CharToByteConverter#getMaxBytesPerChar
- */
-        public int getMaxBytesPerChar() {
-        return 2;
-        }//getMaxBytesPerChar()
-/**
- * @see sun.io.CharToByteConverter#reset
- */
-        public void reset() {
-        byteOff = charOff = 0;
-        }
-} //end of class definition
diff --git a/src/share/classes/sun/io/CharToByteISO2022.java b/src/share/classes/sun/io/CharToByteISO2022.java
deleted file mode 100644
index b49690c..0000000
--- a/src/share/classes/sun/io/CharToByteISO2022.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
-* @author Tom Zhou
-*/
-
-public abstract class CharToByteISO2022 extends CharToByteConverter
-{
-    private final byte ISO_ESC = 0x1b;
-    private final byte ISO_SI = 0x0f;
-    private final byte ISO_SO = 0x0e;
-    private final byte ISO_SS2_7 = 0x4e;
-    private final byte ISO_SS3_7 = 0x4f;
-    private final byte SS2 = (byte)0x8e;
-    private final byte P2 = (byte)0xA2;
-    private final byte P3 = (byte)0xA3;
-    private final byte MSB = (byte)0x80;
-
-    protected final byte maximumDesignatorLength = 4;
-
-    protected String SODesignator,
-                     SS2Designator = null,
-                     SS3Designator = null;
-
-    protected CharToByteConverter codeConverter;
-
-    private boolean shiftout = false;
-    private boolean SODesDefined = false;
-    private boolean SS2DesDefined = false;
-    private boolean SS3DesDefined = false;
-
-    private boolean newshiftout = false;
-    private boolean newSODesDefined = false;
-    private boolean newSS2DesDefined = false;
-    private boolean newSS3DesDefined = false;
-
-    public int flush(byte[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        reset();
-        return 0;
-    }
-
-    public void reset() {
-        shiftout = false;
-        SODesDefined = false;
-        SS2DesDefined = false;
-        SS3DesDefined = false;
-        byteOff = charOff = 0;
-    }
-
-    public boolean canConvert(char ch)
-    {
-        if (ch<0x80)
-           return true;
-        return codeConverter.canConvert(ch);
-    }
-
-    private int unicodeToNative(char unicode, byte ebyte[])
-    {
-        int     index = 0;
-        byte    tmpByte[];
-        byte    convByte[] = new byte[codeConverter.getMaxBytesPerChar()];
-        char    convChar[] = {unicode};
-        int     converted;
-
-        try{
-            converted = codeConverter.convert(convChar, 0, 1, convByte, 0,
-                                        codeConverter.getMaxBytesPerChar());
-        } catch(Exception e) {
-            return -1;
-        }
-
-        if (converted == 2) {
-            if (!SODesDefined) {
-                newSODesDefined = true;
-                ebyte[0] = ISO_ESC;
-                tmpByte = SODesignator.getBytes();
-                System.arraycopy(tmpByte,0,ebyte,1,tmpByte.length);
-                index = tmpByte.length+1;
-            }
-            if (!shiftout) {
-                newshiftout = true;
-                ebyte[index++] = ISO_SO;
-            }
-            ebyte[index++] = (byte)(convByte[0]&0x7f);
-            ebyte[index++] = (byte)(convByte[1]&0x7f);
-        } else {
-            if((convByte[0] == SS2)&&(convByte[1] == P2)) {
-                if (!SS2DesDefined) {
-                    newSS2DesDefined = true;
-                    ebyte[0] = ISO_ESC;
-                    tmpByte = SS2Designator.getBytes();
-                    System.arraycopy(tmpByte,0,ebyte,1,tmpByte.length);
-                    index = tmpByte.length+1;
-                }
-                ebyte[index++] = ISO_ESC;
-                ebyte[index++] = ISO_SS2_7;
-                ebyte[index++] = (byte)(convByte[2]&0x7f);
-                ebyte[index++] = (byte)(convByte[3]&0x7f);
-            }
-            if((convByte[0] == SS2)&&(convByte[1] == 0xA3))
-            {
-                if(!SS3DesDefined){
-                    newSS3DesDefined = true;
-                    ebyte[0] = ISO_ESC;
-                    tmpByte = SS3Designator.getBytes();
-                    System.arraycopy(tmpByte,0,ebyte,1,tmpByte.length);
-                    index = tmpByte.length+1;
-                }
-                ebyte[index++] = ISO_ESC;
-                ebyte[index++] = ISO_SS3_7;
-                ebyte[index++] = (byte)(convByte[2]&0x7f);
-                ebyte[index++] = (byte)(convByte[3]&0x7f);
-            }
-        }
-        return index;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws UnknownCharacterException, MalformedInputException,
-               ConversionBufferFullException
-    {
-        int outputSize;
-        byte [] tmpbuf = new byte[this.getMaxBytesPerChar()];
-        byte [] outputByte;
-
-        byteOff = outOff;
-
-        newshiftout = shiftout;
-        newSODesDefined = SODesDefined;
-        newSS2DesDefined = SS2DesDefined;
-        newSS3DesDefined = SS3DesDefined;
-
-        //Fixed 4122961 by bringing the charOff++ out to this
-        // loop where it belongs, changing the loop from
-        // while(){} to for(){}.
-        for (charOff = inOff; charOff < inEnd; charOff++) {
-            outputByte = tmpbuf;
-            if (input[charOff] < 0x80) {        // ASCII
-                if (shiftout){
-                    newshiftout = false;
-                    outputSize = 2;
-                    outputByte[0] = ISO_SI;
-                    outputByte[1] = (byte)(input[charOff] & 0x7f);
-                } else {
-                    outputSize = 1;
-                    outputByte[0] = (byte)(input[charOff] & 0x7f);
-                }
-                if(input[charOff] == '\n'){
-                    newSODesDefined = false;
-                    newSS2DesDefined = false;
-                    newSS3DesDefined = false;
-                }
-            } else {
-                outputSize = unicodeToNative(input[charOff], outputByte);
-            }
-
-            if (outputSize == -1) {
-                if (subMode) {
-                    if(!newSODesDefined){
-                        newSODesDefined = !newSODesDefined;
-                        outputByte[0] = ISO_SO;
-                        outputByte[1] = (byte)'?';
-                        outputSize = 2;
-                    } else {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                    }
-                } else {
-                    badInputLength = 1;
-                    throw new UnknownCharacterException();
-                }
-            }
-
-            if (outEnd - byteOff < outputSize)
-                throw new ConversionBufferFullException();
-
-            for (int i = 0; i < outputSize; i++)
-                output[byteOff++] = outputByte[i];
-
-            // Bug 4266772. Update statuses only when output buffer has been
-            // updated. When ConversionBufferFullException() has been throwed
-            // we want to keep old statuses for next call.
-            shiftout = newshiftout;
-            SODesDefined = newSODesDefined;
-            SS2DesDefined = newSS2DesDefined;
-            SS3DesDefined = newSS3DesDefined;
-        }
-        return byteOff - outOff;
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO2022CN_CNS.java b/src/share/classes/sun/io/CharToByteISO2022CN_CNS.java
deleted file mode 100644
index 0c1ef30..0000000
--- a/src/share/classes/sun/io/CharToByteISO2022CN_CNS.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
-* @author Tom Zhou
-*/
-
-public class CharToByteISO2022CN_CNS extends CharToByteISO2022
-{
-    public CharToByteISO2022CN_CNS()
-    {
-        SODesignator = "$)G";
-        SS2Designator = "$*H";
-        SS3Designator = "$+I";
-        try {
-            codeConverter = CharToByteConverter.getConverter("CNS11643");
-        } catch (Exception e) {};
-    }
-
-    /**
-     * returns the maximum number of bytes needed to convert a char
-     */
-    public int getMaxBytesPerChar()
-    {
-        return maximumDesignatorLength+4;
-    }
-
-    /**
-     * Return the character set ID
-     */
-    public String getCharacterEncoding()
-    {
-        return "ISO2022CN_CNS";
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO2022CN_GB.java b/src/share/classes/sun/io/CharToByteISO2022CN_GB.java
deleted file mode 100644
index 7edbc9f..0000000
--- a/src/share/classes/sun/io/CharToByteISO2022CN_GB.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
-* @author Tom Zhou
-*/
-
-public class CharToByteISO2022CN_GB extends CharToByteISO2022
-{
-    public CharToByteISO2022CN_GB()
-    {
-        SODesignator = "$)A";
-        try {
-            codeConverter = CharToByteConverter.getConverter("GB2312");
-        } catch (Exception e) {};
-    }
-
-    /**
-     * returns the maximum number of bytes needed to convert a char
-     */
-    public int getMaxBytesPerChar()
-    {
-        return maximumDesignatorLength+4;
-    }
-
-    /**
-     * Return the character set ID
-     */
-    public String getCharacterEncoding()
-    {
-        return "ISO2022CN_GB";
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteISO2022JP.java b/src/share/classes/sun/io/CharToByteISO2022JP.java
deleted file mode 100644
index 3cf4d77..0000000
--- a/src/share/classes/sun/io/CharToByteISO2022JP.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-import java.io.*;
-
-public class CharToByteISO2022JP extends CharToByteJIS0208 {
-
-    private static final int ASCII = 0;                 // ESC ( B
-    private static final int JISX0201_1976 = 1;         // ESC ( J
-    private static final int JISX0208_1978 = 2;         // ESC $ @
-    private static final int JISX0208_1983 = 3;         // ESC $ B
-    private static final int JISX0201_1976_KANA = 4;    // ESC ( I
-
-    private char highHalfZoneCode;
-    private boolean flushed = true;
-
-    // JIS is state full encoding, so currentMode keep the
-    // current codeset
-    private int currentMode = ASCII;
-
-    /**
-     * Bytes for substitute for unmappable input.
-     */
-    // XXX: Assumes subBytes are ASCII string. Need to change Escape sequence
-    // for other character sets.
-    protected byte[] subBytesEscape = { (byte)0x1b, (byte)0x28, (byte)0x42 }; // ESC ( B
-    protected int subBytesMode = ASCII;
-
-    public int flush(byte[] output, int outStart, int outEnd)
-        throws MalformedInputException, ConversionBufferFullException
-    {
-        if (highHalfZoneCode != 0) {
-            highHalfZoneCode = 0;
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-
-        if (!flushed && (currentMode != ASCII)) {
-            if (outEnd - outStart < 3) {
-                throw new ConversionBufferFullException();
-            }
-            output[outStart]     = (byte)0x1b;
-            output[outStart + 1] = (byte)0x28;
-            output[outStart + 2] = (byte)0x42;
-            byteOff += 3;
-            byteOff = charOff = 0;
-            flushed = true;
-            currentMode = ASCII;
-            return 3;
-        }
-        return 0;
-    }
-
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws MalformedInputException, UnknownCharacterException,
-               ConversionBufferFullException
-
-    {
-        char    inputChar;          // Input character to be converted
-        int     inputSize;          // Size of the input
-        int     outputSize;         // Size of the output
-
-        // Buffer for output bytes
-        byte[]  tmpArray = new byte[6];
-        byte[]  outputByte;
-
-        flushed = false;
-
-        // Make copies of input and output indexes
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (highHalfZoneCode != 0) {
-            inputChar = highHalfZoneCode;
-            highHalfZoneCode = 0;
-            if (input[inOff] >= 0xdc00 && input[inOff] <= 0xdfff) {
-                // This is legal UTF16 sequence.
-                badInputLength = 1;
-                throw new UnknownCharacterException();
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException();
-            }
-        }
-
-        // Loop until we run out of input
-        while(charOff < inEnd) {
-            outputByte = tmpArray;
-            int newMode = currentMode; // Trace character mode changing
-
-            // Get the input character
-            inputChar = input[charOff];
-            inputSize = 1;
-            outputSize = 1;
-
-            // Is this a high surrogate?
-            if(inputChar >= '\uD800' && inputChar <= '\uDBFF') {
-                // Is this the last character of the input?
-                if (charOff + 1 >= inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-
-                // Is there a low surrogate following?
-                inputChar = input[charOff + 1];
-                if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                    // We have a valid surrogate pair.  Too bad we don't do
-                    // surrogates.  Is substitution enabled?
-                    if (subMode) {
-                        if (currentMode != subBytesMode) {
-                            System.arraycopy(subBytesEscape, 0, outputByte, 0,
-                                             subBytesEscape.length);
-                            outputSize = subBytesEscape.length;
-                            System.arraycopy(subBytes, 0, outputByte,
-                                             outputSize, subBytes.length);
-                            outputSize += subBytes.length;
-                            newMode = subBytesMode;
-                        } else {
-                            outputByte = subBytes;
-                            outputSize = subBytes.length;
-                        }
-                        inputSize = 2;
-                    } else {
-                        badInputLength = 2;
-                        throw new UnknownCharacterException();
-                    }
-                } else {
-                    // We have a malformed surrogate pair
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-
-            // Is this an unaccompanied low surrogate?
-            else if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            } else {
-                // Not part of a surrogate
-
-                // Does this map to the Roman range?
-                if (inputChar <= '\u007F') {
-                    if (currentMode != ASCII) {
-                        outputByte[0] = (byte)0x1b;
-                        outputByte[1] = (byte)0x28;
-                        outputByte[2] = (byte)0x42;
-                        outputByte[3] = (byte)inputChar;
-                        outputSize = 4;
-                        newMode = ASCII;
-                    } else {
-                        outputByte[0] = (byte)inputChar;
-                        outputSize = 1;
-                    }
-                }
-                // Is it a single byte kana?
-                else if (inputChar >= 0xFF61 && inputChar <= 0xFF9F) {
-                    if (currentMode != JISX0201_1976_KANA) {
-                        outputByte[0] = (byte)0x1b;
-                        outputByte[1] = (byte)0x28;
-                        outputByte[2] = (byte)0x49;
-                        outputByte[3] = (byte)(inputChar - 0xff40);
-                        outputSize = 4;
-                        newMode = JISX0201_1976_KANA;
-                    } else {
-                        outputByte[0] = (byte)(inputChar - 0xff40);
-                        outputSize = 1;
-                    }
-                }
-                // Is it a yen sign?
-                else if (inputChar == '\u00A5') {
-                    if (currentMode != JISX0201_1976) {
-                        outputByte[0] = (byte)0x1b;
-                        outputByte[1] = (byte)0x28;
-                        outputByte[2] = (byte)0x4a;
-                        outputByte[3] = (byte)0x5c;
-                        outputSize = 4;
-                        newMode = JISX0201_1976;
-                    } else {
-                        outputByte[0] = (byte)0x5C;
-                        outputSize = 1;
-                    }
-                }
-                // Is it a tilde?
-                else if (inputChar == '\u203E')
-                    {
-                        if (currentMode != JISX0201_1976) {
-                            outputByte[0] = (byte)0x1b;
-                            outputByte[1] = (byte)0x28;
-                            outputByte[2] = (byte)0x4a;
-                            outputByte[3] = (byte)0x7e;
-                            outputSize = 4;
-                            newMode = JISX0201_1976;
-                        } else {
-                            outputByte[0] = (byte)0x7e;
-                            outputSize = 1;
-                        }
-                    }
-                // Is it a JIS-X-0208 character?
-                else {
-                    int index = getNative(inputChar);
-                    if (index != 0) {
-                        if (currentMode != JISX0208_1983) {
-                            outputByte[0] = (byte)0x1b;
-                            outputByte[1] = (byte)0x24;
-                            outputByte[2] = (byte)0x42;
-                            outputByte[3] = (byte)(index >> 8);
-                            outputByte[4] = (byte)(index & 0xff);
-                            outputSize = 5;
-                            newMode = JISX0208_1983;
-                        } else {
-                            outputByte[0] = (byte)(index >> 8);
-                            outputByte[1] = (byte)(index & 0xff);
-                            outputSize = 2;
-                        }
-                    }
-                    // It doesn't map to JIS-0208!
-                    else {
-                        if (subMode) {
-                            if (currentMode != subBytesMode) {
-                                System.arraycopy(subBytesEscape, 0, outputByte, 0,
-                                                 subBytesEscape.length);
-                                outputSize = subBytesEscape.length;
-                                System.arraycopy(subBytes, 0, outputByte,
-                                                 outputSize, subBytes.length);
-                                outputSize += subBytes.length;
-                                newMode = subBytesMode;
-                            } else {
-                                outputByte = subBytes;
-                                outputSize = subBytes.length;
-                            }
-                        } else {
-                            badInputLength = 1;
-                            throw new UnknownCharacterException();
-                        }
-                    }
-                }
-            }
-
-            // Is there room in the output buffer?
-            // XXX: The code assumes output buffer can hold at least 5 bytes,
-            // in this coverter case. However, there is no way for apps to
-            // see how many bytes will be necessary for next call.
-            // getMaxBytesPerChar() should be overriden in every subclass of
-            // CharToByteConverter and reflect real value (5 for this).
-            if (byteOff + outputSize > outEnd)
-                throw new ConversionBufferFullException();
-
-            // Put the output into the buffer
-            for ( int i = 0 ; i < outputSize ; i++ )
-                output[byteOff++] = outputByte[i];
-
-            // Advance the input pointer
-            charOff += inputSize;
-
-            // We can successfuly output the characters, changes
-            // current mode. Fix for 4251646.
-            currentMode = newMode;
-        }
-
-        // return mode ASCII at the end
-        if (currentMode != ASCII){
-            if (byteOff + 3 > outEnd)
-                throw new ConversionBufferFullException();
-
-            output[byteOff++] = 0x1b;
-            output[byteOff++] = 0x28;
-            output[byteOff++] = 0x42;
-            currentMode = ASCII;
-        }
-
-        // Return the length written to the output buffer
-        return byteOff-outOff;
-    }
-
-    // Reset
-    public void reset() {
-        highHalfZoneCode = 0;
-        byteOff = charOff = 0;
-        currentMode = ASCII;
-    }
-
-    /**
-     * returns the maximum number of bytes needed to convert a char
-     */
-    public int getMaxBytesPerChar() {
-        return 8;
-    }
-
-    // Return the character set ID
-    public String getCharacterEncoding() {
-        return "ISO2022JP";
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteISO2022KR.java b/src/share/classes/sun/io/CharToByteISO2022KR.java
deleted file mode 100644
index 092cc2b..0000000
--- a/src/share/classes/sun/io/CharToByteISO2022KR.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-public class CharToByteISO2022KR extends CharToByteISO2022
-{
-    public CharToByteISO2022KR()
-    {
-        SODesignator = "$)C";
-        try {
-            codeConverter = CharToByteConverter.getConverter("KSC5601");
-        } catch (Exception e) {};
-    }
-
-    /**
-     * returns the maximum number of bytes needed to convert a char
-     */
-    public int getMaxBytesPerChar()
-    {
-        return maximumDesignatorLength+4;
-    }
-
-    /**
-     * Return the character set ID
-     */
-    public String getCharacterEncoding()
-    {
-        return "ISO2022KR";
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_1.java b/src/share/classes/sun/io/CharToByteISO8859_1.java
deleted file mode 100644
index 1708600..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_1.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 1996, 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-public class CharToByteISO8859_1 extends CharToByteConverter {
-
-    // Return the character set ID
-    public String getCharacterEncoding()
-    {
-        return "ISO8859_1";
-    }
-
-    private char highHalfZoneCode;
-
-    public int flush(byte[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (highHalfZoneCode != 0) {
-            highHalfZoneCode = 0;
-            throw new MalformedInputException
-                ("String ends with <High Half Zone code> of UTF16");
-        }
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    /*
-    * Character conversion
-    */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws MalformedInputException,
-               UnknownCharacterException,
-               ConversionBufferFullException
-
-    {
-
-        char    inputChar;          // Input character to be converted
-        byte[]  outputByte;         // Output byte written to output
-        byte[]  tmpArray = new byte[1];
-        int     inputSize;          // Size of input
-        int     outputSize;         // Size of output
-
-        // Record beginning offsets
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (highHalfZoneCode != 0) {
-            inputChar = highHalfZoneCode;
-            highHalfZoneCode = 0;
-            if (input[inOff] >= 0xdc00 && input[inOff] <= 0xdfff) {
-                // This is legal UTF16 sequence.
-                if (subMode) {
-                    outputSize = subBytes.length;
-                    if (byteOff + outputSize > outEnd)
-                        throw new ConversionBufferFullException();
-                    for(int i = 0; i < outputSize; i++)
-                        output[byteOff++] = subBytes[i];
-                    charOff += 1;
-                } else {
-                    badInputLength = 1;
-                    throw new UnknownCharacterException();
-                }
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException
-                    ("Previous converted string ends with " +
-                     "<High Half Zone Code> of UTF16 " +
-                     ", but this string is not begin with <Low Half Zone>");
-            }
-        }
-
-        // Loop until we hit the end of the input
-        while(charOff < inEnd) {
-            outputByte = tmpArray;
-
-            // Get the input character
-            inputChar = input[charOff];
-
-            // default outputSize
-            outputSize = 1;
-
-            // Assume this is a simple character
-            inputSize = 1;
-
-            // Is this a high surrogate?
-            if(inputChar >= '\uD800' && inputChar <= '\uDBFF') {
-                // Is this the last character in the input?
-                if (charOff + 1 == inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-
-                // Is there a low surrogate following?
-                inputChar = input[charOff + 1];
-                if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                    // We have a valid surrogate pair.  Too bad we don't map
-                    //  surrogates.  Is substitution enabled?
-                    if (subMode) {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                        inputSize = 2;
-                    } else {
-                        badInputLength = 2;
-                        throw new UnknownCharacterException();
-                    }
-                } else {
-                    // We have a malformed surrogate pair
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-            // Is this an unaccompanied low surrogate?
-            else if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            }
-            // Not part of a surrogate, so try to convert
-            else {
-                // Is this character mappable?
-                if (inputChar <= '\u00FF') {
-                        outputByte[0] = (byte)inputChar;
-                } else {
-                    // Is substitution enabled?
-                    if (subMode) {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                    } else {
-                        badInputLength = 1;
-                        throw new UnknownCharacterException();
-                    }
-                }
-            }
-
-            // If we don't have room for the output, throw an exception
-            if (byteOff + outputSize > outEnd)
-                throw new ConversionBufferFullException();
-
-            // Put the byte in the output buffer
-            for (int i = 0; i < outputSize; i++) {
-                output[byteOff++] = outputByte[i];
-            }
-            charOff += inputSize;
-        }
-
-        // Return the length written to the output buffer
-        return byteOff-outOff;
-    }
-
-    // Determine if a character is mappable or not
-    public boolean canConvert(char ch)
-    {
-        return (ch <= '\u00FF');
-    }
-
-    // Reset the converter
-    public void reset()
-    {
-        byteOff = charOff = 0;
-        highHalfZoneCode = 0;
-    }
-
-    /**
-    * returns the maximum number of bytes needed to convert a char
-    */
-    public int getMaxBytesPerChar()
-    {
-        return 1;
-    }
-
-
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_13.java b/src/share/classes/sun/io/CharToByteISO8859_13.java
deleted file mode 100644
index 4158595..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_13.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_13;
-
-/**
- * Tables and data to convert Unicode to ISO8859_13
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_13 extends CharToByteSingleByte {
-
-    private final static ISO_8859_13 nioCoder = new ISO_8859_13();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_13";
-    }
-
-    public CharToByteISO8859_13() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_15.java b/src/share/classes/sun/io/CharToByteISO8859_15.java
deleted file mode 100644
index 65436ff..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_15.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_15;
-
-/**
- * Tables and data to convert Unicode to ISO8859_15
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_15 extends CharToByteSingleByte {
-
-    private final static ISO_8859_15 nioCoder = new ISO_8859_15();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_15";
-    }
-
-    public CharToByteISO8859_15() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_2.java b/src/share/classes/sun/io/CharToByteISO8859_2.java
deleted file mode 100644
index 0ea9562..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_2.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_2;
-
-/**
- * Tables and data to convert Unicode to ISO8859_2
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_2 extends CharToByteSingleByte {
-
-    private final static ISO_8859_2 nioCoder = new ISO_8859_2();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_2";
-    }
-
-    public CharToByteISO8859_2() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_3.java b/src/share/classes/sun/io/CharToByteISO8859_3.java
deleted file mode 100644
index 78b29f4..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_3.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.ISO_8859_3;
-
-/**
- * Tables and data to convert Unicode to ISO8859_3
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_3 extends CharToByteSingleByte {
-
-    private final static ISO_8859_3 nioCoder = new ISO_8859_3();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_3";
-    }
-
-    public CharToByteISO8859_3() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_4.java b/src/share/classes/sun/io/CharToByteISO8859_4.java
deleted file mode 100644
index c6055e1..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_4.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_4;
-
-/**
- * Tables and data to convert Unicode to ISO8859_4
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_4 extends CharToByteSingleByte {
-
-    private final static ISO_8859_4 nioCoder = new ISO_8859_4();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_4";
-    }
-
-    public CharToByteISO8859_4() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_5.java b/src/share/classes/sun/io/CharToByteISO8859_5.java
deleted file mode 100644
index 84e8f4d..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_5.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_5;
-
-/**
- * Tables and data to convert Unicode to ISO8859_5
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_5 extends CharToByteSingleByte {
-
-    private final static ISO_8859_5 nioCoder = new ISO_8859_5();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_5";
-    }
-
-    public CharToByteISO8859_5() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_6.java b/src/share/classes/sun/io/CharToByteISO8859_6.java
deleted file mode 100644
index d724187..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_6.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.ISO_8859_6;
-
-/**
- * Tables and data to convert Unicode to ISO8859_6
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_6 extends CharToByteSingleByte {
-
-    private final static ISO_8859_6 nioCoder = new ISO_8859_6();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_6";
-    }
-
-    public CharToByteISO8859_6() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_7.java b/src/share/classes/sun/io/CharToByteISO8859_7.java
deleted file mode 100644
index 3607958..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_7.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_7;
-
-
-/**
- * Tables and data to convert Unicode to ISO8859_7
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_7 extends CharToByteSingleByte {
-
-    public String getCharacterEncoding() {
-        return "ISO8859_7";
-    }
-
-    private final static ISO_8859_7 nioCoder = new ISO_8859_7();
-
-    public CharToByteISO8859_7() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_8.java b/src/share/classes/sun/io/CharToByteISO8859_8.java
deleted file mode 100644
index 47465f9..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_8.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.ISO_8859_8;
-
-/**
- * Tables and data to convert Unicode to ISO8859_8
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_8 extends CharToByteSingleByte {
-
-    private final static ISO_8859_8 nioCoder = new ISO_8859_8();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_8";
-    }
-
-    public CharToByteISO8859_8() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteISO8859_9.java b/src/share/classes/sun/io/CharToByteISO8859_9.java
deleted file mode 100644
index 58ce4dc..0000000
--- a/src/share/classes/sun/io/CharToByteISO8859_9.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ISO_8859_9;
-
-/**
- * Tables and data to convert Unicode to ISO8859_9
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteISO8859_9 extends CharToByteSingleByte {
-
-    private final static ISO_8859_9 nioCoder = new ISO_8859_9();
-
-    public String getCharacterEncoding() {
-        return "ISO8859_9";
-    }
-
-    public CharToByteISO8859_9() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteJIS0201.java b/src/share/classes/sun/io/CharToByteJIS0201.java
deleted file mode 100644
index cc4c6bf..0000000
--- a/src/share/classes/sun/io/CharToByteJIS0201.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * Tables and data to convert Unicode to JIS0201
- *
- * @author  ConverterGenerator tool
- * @version >= JDK1.1.6
- */
-
-class CharToByteJIS0201 extends CharToByteSingleByte {
-
-    public String getCharacterEncoding() {
-        return "JIS0201";
-    }
-
-    public CharToByteJIS0201() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        /*
-        super.index1 = index1;
-        super.index2 = index2;
-        */
-    }
-
-    public byte getNative(char inputChar) {
-        return (byte)index2.charAt(index1[(inputChar & mask1) >> shift]
-                + (inputChar & mask2));
-    }
-
-   public boolean canConvert(char ch) {
-        if (index2.charAt(index1[((ch & mask1) >> shift)] + (ch & mask2)) != '\u0000')
-            return true;
-        return (ch == '\u0000');
-    }
-
-    private final static String index2 =
-
-        "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007" +
-        "\b\t\n\u000B\f\r\u000E\u000F" +
-        "\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017" +
-        "\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" +
-        "\u0020\u0021\"\u0023\u0024\u0025\u0026\'" +
-        "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F" +
-        "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037" +
-        "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F" +
-        "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047" +
-        "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F" +
-        "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057" +
-        "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F" +
-        "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067" +
-        "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F" +
-        "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077" +
-        "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u007F" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\\\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u007E\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u00A1\u00A2\u00A3\u00A4\u00A5\u00A6\u00A7\u00A8" +
-        "\u00A9\u00AA\u00AB\u00AC\u00AD\u00AE\u00AF\u00B0" +
-        "\u00B1\u00B2\u00B3\u00B4\u00B5\u00B6\u00B7\u00B8" +
-        "\u00B9\u00BA\u00BB\u00BC\u00BD\u00BE\u00BF\u00C0" +
-        "\u00C1\u00C2\u00C3\u00C4\u00C5\u00C6\u00C7\u00C8" +
-        "\u00C9\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D0" +
-        "\u00D1\u00D2\u00D3\u00D4\u00D5\u00D6\u00D7\u00D8" +
-        "\u00D9\u00DA\u00DB\u00DC\u00DD\u00DE\u00DF\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-        "\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
-
-    private final static short index1[] = {
-        0, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        360, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166,
-        166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 519,
-    };
-
-}
diff --git a/src/share/classes/sun/io/CharToByteJIS0208.java b/src/share/classes/sun/io/CharToByteJIS0208.java
deleted file mode 100644
index 367f1fa..0000000
--- a/src/share/classes/sun/io/CharToByteJIS0208.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0208_Encoder;
-
-/**
- * Tables and data to convert Unicode to JIS0208
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteJIS0208 extends CharToByteDoubleByte {
-
-    public String getCharacterEncoding() {
-        return "JIS0208";
-    }
-
-    public CharToByteJIS0208() {
-        super.index1 = JIS_X_0208_Encoder.getIndex1();
-        super.index2 = JIS_X_0208_Encoder.getIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteJIS0208_Solaris.java b/src/share/classes/sun/io/CharToByteJIS0208_Solaris.java
deleted file mode 100644
index f026f28..0000000
--- a/src/share/classes/sun/io/CharToByteJIS0208_Solaris.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0208_Solaris_Encoder;
-
-/**
- * Tables and data to convert Unicode to JIS0208_Solaris
- *
- *
- * Vendor defined chars added for benefit of vendor defined character
- * supplemented mappings for EUC-JP-Solaris/PCK Solaris variants of EUC-JP
- * and SJIS/Shift_JIS (4765370)
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteJIS0208_Solaris extends CharToByteDoubleByte {
-
-    public String getCharacterEncoding() {
-        return "JIS0208_Solaris";
-    }
-
-    public CharToByteJIS0208_Solaris() {
-        super.index1 = JIS_X_0208_Solaris_Encoder.getIndex1();
-        super.index2 = JIS_X_0208_Solaris_Encoder.getIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteJIS0212.java b/src/share/classes/sun/io/CharToByteJIS0212.java
deleted file mode 100644
index 18607555..0000000
--- a/src/share/classes/sun/io/CharToByteJIS0212.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-import sun.nio.cs.ext.JIS_X_0212_Encoder;
-
-/**
- * Tables and data to convert Unicode to JIS0212
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteJIS0212 extends CharToByteDoubleByte {
-    public String getCharacterEncoding() {
-        return "JIS0212";
-    }
-
-    public CharToByteJIS0212() {
-        super.index1 = JIS_X_0212_Encoder.getIndex1();
-        super.index2 = JIS_X_0212_Encoder.getIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteJIS0212_Solaris.java b/src/share/classes/sun/io/CharToByteJIS0212_Solaris.java
deleted file mode 100644
index 43c4670..0000000
--- a/src/share/classes/sun/io/CharToByteJIS0212_Solaris.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0212_Solaris_Encoder;
-
-/**
- * Tables and data to convert Unicode to JIS0212_Solaris
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteJIS0212_Solaris extends CharToByteDoubleByte {
-
-    public String getCharacterEncoding() {
-        return "JIS0212_Solaris";
-    }
-
-    public CharToByteJIS0212_Solaris() {
-        super.index1 = JIS_X_0212_Solaris_Encoder.getIndex1();
-        super.index2 = JIS_X_0212_Solaris_Encoder.getIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteJohab.java b/src/share/classes/sun/io/CharToByteJohab.java
deleted file mode 100644
index d0536f1..0000000
--- a/src/share/classes/sun/io/CharToByteJohab.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteJohab extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new Johab().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "Johab";
-    }
-
-    public CharToByteJohab() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteKOI8_R.java b/src/share/classes/sun/io/CharToByteKOI8_R.java
deleted file mode 100644
index 7688541..0000000
--- a/src/share/classes/sun/io/CharToByteKOI8_R.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.KOI8_R;
-
-/**
- * Tables and data to convert Unicode to KOI8_R
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteKOI8_R extends CharToByteSingleByte {
-
-    private final static KOI8_R nioCoder = new KOI8_R();
-
-    public String getCharacterEncoding() {
-        return "KOI8_R";
-    }
-
-    public CharToByteKOI8_R() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMS874.java b/src/share/classes/sun/io/CharToByteMS874.java
deleted file mode 100644
index b855d63..0000000
--- a/src/share/classes/sun/io/CharToByteMS874.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.MS874;
-
-/**
- * Tables and data to convert Unicode to MS874
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMS874 extends CharToByteSingleByte {
-
-    private final static MS874 nioCoder = new MS874();
-
-    public String getCharacterEncoding() {
-        return "MS874";
-    }
-
-    public CharToByteMS874() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMS932.java b/src/share/classes/sun/io/CharToByteMS932.java
deleted file mode 100644
index 1768752..0000000
--- a/src/share/classes/sun/io/CharToByteMS932.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteMS932 extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new MS932().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "MS932";
-    }
-
-    public CharToByteMS932() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMS936.java b/src/share/classes/sun/io/CharToByteMS936.java
deleted file mode 100644
index 362c3a9..0000000
--- a/src/share/classes/sun/io/CharToByteMS936.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteMS936 extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new MS936().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "MS936";
-    }
-
-    public CharToByteMS936() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMS949.java b/src/share/classes/sun/io/CharToByteMS949.java
deleted file mode 100644
index 11e678d..0000000
--- a/src/share/classes/sun/io/CharToByteMS949.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteMS949 extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new MS949().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "MS949";
-    }
-
-    public CharToByteMS949() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMS950.java b/src/share/classes/sun/io/CharToByteMS950.java
deleted file mode 100644
index 8ec65a9..0000000
--- a/src/share/classes/sun/io/CharToByteMS950.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.io;
-
-import sun.nio.cs.ext.*;
-
-public class CharToByteMS950 extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new MS950().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "MS950";
-    }
-
-    public CharToByteMS950() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMS950_HKSCS.java b/src/share/classes/sun/io/CharToByteMS950_HKSCS.java
deleted file mode 100644
index 540d3aa..0000000
--- a/src/share/classes/sun/io/CharToByteMS950_HKSCS.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.DoubleByte;
-import sun.nio.cs.ext.MS950_HKSCS;
-
-public class CharToByteMS950_HKSCS extends CharToByteDBCS_ASCII {
-
-    private static DoubleByte.Encoder enc =
-        (DoubleByte.Encoder)new MS950_HKSCS().newEncoder();
-
-    public String getCharacterEncoding() {
-        return "MS950_HKSCS";
-    }
-
-    public CharToByteMS950_HKSCS() {
-        super(enc);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacArabic.java b/src/share/classes/sun/io/CharToByteMacArabic.java
deleted file mode 100644
index 1cd58c8..0000000
--- a/src/share/classes/sun/io/CharToByteMacArabic.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacArabic;
-
-/**
- * Tables and data to convert Unicode to MacArabic
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacArabic extends CharToByteSingleByte {
-
-    private final static MacArabic nioCoder = new MacArabic();
-
-    public String getCharacterEncoding() {
-        return "MacArabic";
-    }
-
-    public CharToByteMacArabic() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacCentralEurope.java b/src/share/classes/sun/io/CharToByteMacCentralEurope.java
deleted file mode 100644
index 7ddfd29..0000000
--- a/src/share/classes/sun/io/CharToByteMacCentralEurope.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacCentralEurope;
-
-/**
- * Tables and data to convert Unicode to MacCentralEurope
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacCentralEurope extends CharToByteSingleByte {
-
-    private final static MacCentralEurope nioCoder = new MacCentralEurope();
-
-    public String getCharacterEncoding() {
-        return "MacCentralEurope";
-    }
-
-    public CharToByteMacCentralEurope() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacCroatian.java b/src/share/classes/sun/io/CharToByteMacCroatian.java
deleted file mode 100644
index 2ff6d0a..0000000
--- a/src/share/classes/sun/io/CharToByteMacCroatian.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacCroatian;
-
-/**
- * Tables and data to convert Unicode to MacCroatian
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacCroatian extends CharToByteSingleByte {
-
-    private final static MacCroatian nioCoder = new MacCroatian();
-
-    public String getCharacterEncoding() {
-        return "MacCroatian";
-    }
-
-    public CharToByteMacCroatian() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacCyrillic.java b/src/share/classes/sun/io/CharToByteMacCyrillic.java
deleted file mode 100644
index 17aefef..0000000
--- a/src/share/classes/sun/io/CharToByteMacCyrillic.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacCyrillic;
-
-/**
- * Tables and data to convert Unicode to MacCyrillic
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacCyrillic extends CharToByteSingleByte {
-
-    private final static MacCyrillic nioCoder = new MacCyrillic();
-
-    public String getCharacterEncoding() {
-        return "MacCyrillic";
-    }
-
-    public CharToByteMacCyrillic() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacDingbat.java b/src/share/classes/sun/io/CharToByteMacDingbat.java
deleted file mode 100644
index 0d53511..0000000
--- a/src/share/classes/sun/io/CharToByteMacDingbat.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacDingbat;
-
-/**
- * Tables and data to convert Unicode to MacDingbat
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacDingbat extends CharToByteSingleByte {
-
-    private final static MacDingbat nioCoder = new MacDingbat();
-
-    public String getCharacterEncoding() {
-        return "MacDingbat";
-    }
-
-    public CharToByteMacDingbat() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacGreek.java b/src/share/classes/sun/io/CharToByteMacGreek.java
deleted file mode 100644
index a520a13..0000000
--- a/src/share/classes/sun/io/CharToByteMacGreek.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacGreek;
-
-/**
- * Tables and data to convert Unicode to MacGreek
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacGreek extends CharToByteSingleByte {
-
-    private final static MacGreek nioCoder = new MacGreek();
-
-    public String getCharacterEncoding() {
-        return "MacGreek";
-    }
-
-    public CharToByteMacGreek() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacHebrew.java b/src/share/classes/sun/io/CharToByteMacHebrew.java
deleted file mode 100644
index c725c90..0000000
--- a/src/share/classes/sun/io/CharToByteMacHebrew.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacHebrew;
-
-/**
- * Tables and data to convert Unicode to MacHebrew
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacHebrew extends CharToByteSingleByte {
-
-    private final static MacHebrew nioCoder = new MacHebrew();
-
-    public String getCharacterEncoding() {
-        return "MacHebrew";
-    }
-
-    public CharToByteMacHebrew() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacIceland.java b/src/share/classes/sun/io/CharToByteMacIceland.java
deleted file mode 100644
index 8b4d2dc..0000000
--- a/src/share/classes/sun/io/CharToByteMacIceland.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacIceland;
-
-/**
- * Tables and data to convert Unicode to MacIceland
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacIceland extends CharToByteSingleByte {
-
-    private final static MacIceland nioCoder = new MacIceland();
-
-    public String getCharacterEncoding() {
-        return "MacIceland";
-    }
-
-    public CharToByteMacIceland() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacRoman.java b/src/share/classes/sun/io/CharToByteMacRoman.java
deleted file mode 100644
index ea6b1a2..0000000
--- a/src/share/classes/sun/io/CharToByteMacRoman.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacRoman;
-
-/**
- * Tables and data to convert Unicode to MacRoman
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacRoman extends CharToByteSingleByte {
-
-    private final static MacRoman nioCoder = new MacRoman();
-
-    public String getCharacterEncoding() {
-        return "MacRoman";
-    }
-
-    public CharToByteMacRoman() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacRomania.java b/src/share/classes/sun/io/CharToByteMacRomania.java
deleted file mode 100644
index bad0a86..0000000
--- a/src/share/classes/sun/io/CharToByteMacRomania.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacRomania;
-
-/**
- * Tables and data to convert Unicode to MacRomania
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacRomania extends CharToByteSingleByte {
-
-    private final static MacRomania nioCoder = new MacRomania();
-
-    public String getCharacterEncoding() {
-        return "MacRomania";
-    }
-
-    public CharToByteMacRomania() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacSymbol.java b/src/share/classes/sun/io/CharToByteMacSymbol.java
deleted file mode 100644
index 6043cd0..0000000
--- a/src/share/classes/sun/io/CharToByteMacSymbol.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacSymbol;
-
-/**
- * Tables and data to convert Unicode to MacSymbol
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacSymbol extends CharToByteSingleByte {
-
-    private final static MacSymbol nioCoder = new MacSymbol();
-
-    public String getCharacterEncoding() {
-        return "MacSymbol";
-    }
-
-    public CharToByteMacSymbol() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacThai.java b/src/share/classes/sun/io/CharToByteMacThai.java
deleted file mode 100644
index 3d6f73f..0000000
--- a/src/share/classes/sun/io/CharToByteMacThai.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacThai;
-
-/**
- * Tables and data to convert Unicode to MacThai
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacThai extends CharToByteSingleByte {
-
-    private final static MacThai nioCoder = new MacThai();
-
-    public String getCharacterEncoding() {
-        return "MacThai";
-    }
-
-    public CharToByteMacThai() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacTurkish.java b/src/share/classes/sun/io/CharToByteMacTurkish.java
deleted file mode 100644
index 3e8aaa1..0000000
--- a/src/share/classes/sun/io/CharToByteMacTurkish.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacTurkish;
-
-/**
- * Tables and data to convert Unicode to MacTurkish
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacTurkish extends CharToByteSingleByte {
-
-    private final static MacTurkish nioCoder = new MacTurkish();
-
-    public String getCharacterEncoding() {
-        return "MacTurkish";
-    }
-
-    public CharToByteMacTurkish() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteMacUkraine.java b/src/share/classes/sun/io/CharToByteMacUkraine.java
deleted file mode 100644
index 714fd38..0000000
--- a/src/share/classes/sun/io/CharToByteMacUkraine.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.MacUkraine;
-
-/**
- * Tables and data to convert Unicode to MacUkraine
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteMacUkraine extends CharToByteSingleByte {
-
-    private final static MacUkraine nioCoder = new MacUkraine();
-
-    public String getCharacterEncoding() {
-        return "MacUkraine";
-    }
-
-    public CharToByteMacUkraine() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToBytePCK.java b/src/share/classes/sun/io/CharToBytePCK.java
deleted file mode 100644
index 89c13cd..0000000
--- a/src/share/classes/sun/io/CharToBytePCK.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.JIS_X_0208_Solaris_Encoder;
-
-/**
- * @author Limin Shi
- * @author Mark Son-Bell
- * @author Ian Little
- *
- * PCK char->byte converter for Solaris platform containing additional
- * mappings for vendor defined chars (NEC row 13 & IBM extension chars)
- * (bugID 4765370)
- */
-public class CharToBytePCK extends CharToByteSJIS {
-    CharToByteJIS0201 cbJIS0201 = new CharToByteJIS0201();
-    short[] j0208Index1 = JIS_X_0208_Solaris_Encoder.getIndex1();
-    String[] j0208Index2 = JIS_X_0208_Solaris_Encoder.getIndex2();
-
-    public String getCharacterEncoding() {
-        return "PCK";
-    }
-
-    protected int convSingleByte(char inputChar, byte[] outputByte) {
-        byte b;
-
-        // \u0000 - \u007F map straight through
-        if ((inputChar & 0xFF80) == 0) {
-            outputByte[0] = (byte)inputChar;
-            return 1;
-        }
-
-        if ((b = cbJIS0201.getNative(inputChar)) == 0)
-            return 0;
-
-        outputByte[0] = b;
-        return 1;
-    }
-
-    protected int getNative(char ch) {
-        int result = 0;
-
-         switch (ch) {
-            case '\u2015':
-                return 0x815C;
-            case '\u2014':
-                return 0;
-            default:
-                break;
-        }
-
-        if ((result = super.getNative(ch)) != 0) {
-            return result;
-        } else {
-            int offset = j0208Index1[ch >> 8] << 8;
-            int pos = j0208Index2[offset >> 12].charAt((offset & 0xfff) + (ch & 0xff));
-
-            if (pos != 0) {
-                /*
-                 * This algorithm for converting from JIS to SJIS comes from Ken Lunde's
-                 * "Understanding Japanese Information Processing", pg 163.
-                 */
-                int c1 = (pos >> 8) & 0xff;
-                int c2 = pos & 0xff;
-                int rowOffset = c1 < 0x5F ? 0x70 : 0xB0;
-                int cellOffset = (c1 % 2 == 1) ? (c2 > 0x5F ? 0x20 : 0x1F) : 0x7E;
-                result =  ((((c1 + 1 ) >> 1) + rowOffset) << 8) | (c2 + cellOffset);
-            }
-        }
-        return result;
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteSJIS.java b/src/share/classes/sun/io/CharToByteSJIS.java
deleted file mode 100644
index 1c5969d..0000000
--- a/src/share/classes/sun/io/CharToByteSJIS.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1996, 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-/**
- * @author Limin Shi
- * @author Mark Son-Bell
- */
-
-public class CharToByteSJIS extends CharToByteJIS0208 {
-    CharToByteJIS0201 cbJIS0201 = new CharToByteJIS0201();
-
-    public String getCharacterEncoding() {
-        return "SJIS";
-    }
-
-    protected int convSingleByte(char inputChar, byte[] outputByte) {
-        byte b;
-
-        // \u0000 - \u007F map straight through
-        if ((inputChar & 0xFF80) == 0) {
-            outputByte[0] = (byte)inputChar;
-            return 1;
-        }
-
-        if ((b = cbJIS0201.getNative(inputChar)) == 0)
-            return 0;
-
-        outputByte[0] = b;
-        return 1;
-    }
-
-    protected int getNative(char ch) {
-        int offset = index1[ch >> 8] << 8;
-        int pos = index2[offset >> 12].charAt((offset & 0xfff) + (ch & 0xff));
-        if (pos == 0) {
-            /* Zero value indicates this Unicode has no mapping to JIS0208.
-             * We bail here because the JIS -> SJIS algorithm produces
-             * bogus SJIS values for invalid JIS input.  Zero should be the
-             * only invalid JIS value in our table.
-             */
-            return 0;
-        }
-        /*
-         * This algorithm for converting from JIS to SJIS comes from Ken Lunde's
-         * "Understanding Japanese Information Processing", pg 163.
-         */
-        int c1 = (pos >> 8) & 0xff;
-        int c2 = pos & 0xff;
-        int rowOffset = c1 < 0x5F ? 0x70 : 0xB0;
-        int cellOffset = (c1 % 2 == 1) ? (c2 > 0x5F ? 0x20 : 0x1F) : 0x7E;
-        return ((((c1 + 1 ) >> 1) + rowOffset) << 8) | (c2 + cellOffset);
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteSingleByte.java b/src/share/classes/sun/io/CharToByteSingleByte.java
deleted file mode 100644
index 026a066..0000000
--- a/src/share/classes/sun/io/CharToByteSingleByte.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import static sun.nio.cs.CharsetMapping.*;
-
-/**
-* A table driven conversion from char to byte for single byte
-* character sets.  Tables will reside in the class CharToByteYYYYY,
-* where YYYYY is a unique character set identifier
-
-    < TBD: Tables are of the form... >
-
-*
-* @author Lloyd Honomichl
-* @author Asmus Freytag
-* @version 8/28/96
-*/
-
-public abstract class CharToByteSingleByte extends CharToByteConverter {
-
-    /*
-     * 1st level index, provided by subclass
-     */
-    protected char[] index1;
-
-    /*
-     * 2nd level index, provided by subclass
-     */
-    protected char[] index2;
-
-    /*
-     * Mask to isolate bits for 1st level index, from subclass
-     */
-    protected int   mask1;
-
-    /*
-     * Mask to isolate bits for 2nd level index, from subclass
-     */
-    protected int   mask2;
-
-    /*
-     * Shift to isolate bits for 1st level index, from subclass
-     */
-    protected int   shift;
-
-    private char highHalfZoneCode;
-
-    public char[] getIndex1() {
-        return index1;
-    }
-
-    public char[] getIndex2() {
-        return index2;
-    }
-    public int flush(byte[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (highHalfZoneCode != 0) {
-            highHalfZoneCode = 0;
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    /**
-     * Converts characters to sequences of bytes.
-     * Conversions that result in Exceptions can be restarted by calling
-     * convert again, with appropriately modified parameters.
-     * @return the characters written to output.
-     * @param input char array containing text in Unicode
-     * @param inStart offset in input array
-     * @param inEnd offset of last byte to be converted
-     * @param output byte array to receive conversion result
-     * @param outStart starting offset
-     * @param outEnd offset of last byte to be written to
-     * @throw MalformedInputException for any sequence of chars that is
-     * illegal in Unicode (principally unpaired surrogates
-     * and \uFFFF or \uFFFE), including any partial surrogate pair
-     * which occurs at the end of an input buffer.
-     * @throw UnsupportedCharacterException for any character that
-     * that cannot be converted to the external character set.
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws MalformedInputException,
-               UnknownCharacterException,
-               ConversionBufferFullException
-    {
-        char    inputChar;          // Input character to be converted
-        byte[]  outputByte;         // Output byte written to output
-        int     inputSize;          // Size of input
-        int     outputSize;         // Size of output
-
-        byte[]  tmpArray = new byte[1];
-
-        // Record beginning offsets
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (highHalfZoneCode != 0) {
-            inputChar = highHalfZoneCode;
-            highHalfZoneCode = 0;
-            if (input[inOff] >= 0xdc00 && input[inOff] <= 0xdfff) {
-                // This is legal UTF16 sequence.
-                badInputLength = 1;
-                throw new UnknownCharacterException();
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException();
-            }
-        }
-
-        // Loop until we hit the end of the input
-        while(charOff < inEnd) {
-
-            outputByte = tmpArray;
-
-            // Get the input character
-            inputChar = input[charOff];
-
-            // Default output size
-            outputSize = 1;
-
-            // Assume this is a simple character
-            inputSize = 1;
-
-            // Is this a high surrogate?
-            if(inputChar >= '\uD800' && inputChar <= '\uDBFF') {
-                // Is this the last character in the input?
-                if (charOff + 1 >= inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-
-                // Is there a low surrogate following?
-                inputChar = input[charOff + 1];
-                if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                    // We have a valid surrogate pair.  Too bad we don't map
-                    //  surrogates.  Is substitution enabled?
-                    if (subMode) {
-                        outputByte = subBytes;
-                        outputSize = subBytes.length;
-                        inputSize = 2;
-                    } else {
-                        badInputLength = 2;
-                        throw new UnknownCharacterException();
-                    }
-                } else {
-                    // We have a malformed surrogate pair
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-            }
-
-            // Is this an unaccompanied low surrogate?
-            else if (inputChar >= '\uDC00' && inputChar <= '\uDFFF') {
-                badInputLength = 1;
-                throw new MalformedInputException();
-            }
-
-            // Not part of a surrogate, so look it up
-            else {
-                // Get output using two level lookup
-                outputByte[0] = getNative(inputChar);
-
-                // Might this character be unmappable?
-                if (outputByte[0] == 0) {
-                    // If outputByte is zero because the input was zero
-                    //  then this character is actually mappable
-                    if (input[charOff] != '\u0000') {
-                        // We have an unmappable character
-                        // Is substitution enabled?
-                        if (subMode) {
-                            outputByte = subBytes;
-                            outputSize = subBytes.length;
-                        } else {
-                            badInputLength = 1;
-                            throw new UnknownCharacterException();
-                        }
-                    }
-                }
-            }
-
-            // If we don't have room for the output, throw an exception
-            if (byteOff + outputSize > outEnd)
-                throw new ConversionBufferFullException();
-
-            // Put the byte in the output buffer
-            for (int i = 0; i < outputSize; i++) {
-                output[byteOff++] = outputByte[i];
-            }
-            charOff += inputSize;
-
-        }
-
-        // Return the length written to the output buffer
-        return byteOff - outOff;
-    }
-
-    /**
-     * the maximum number of bytes needed to hold a converted char
-     * @returns the maximum number of bytes needed for a converted char
-     */
-    public int getMaxBytesPerChar() {
-        return 1;
-    }
-
-    int encodeChar(char ch) {
-        char index = index1[ch >> 8];
-        if (index == UNMAPPABLE_ENCODING)
-            return UNMAPPABLE_ENCODING;
-        return index2[index + (ch & 0xff)];
-    }
-
-    public byte getNative(char inputChar) {
-        int b = encodeChar(inputChar);
-        if (b == UNMAPPABLE_ENCODING)
-            return 0;
-        return (byte)b;
-    }
-
-    /**
-     *  Resets the converter.
-     * Call this method to reset the converter to its initial state
-     */
-    public void reset() {
-        byteOff = charOff = 0;
-        highHalfZoneCode = 0;
-    }
-
-    /**
-     * Return whether a character is mappable or not
-     * @return true if a character is mappable
-     */
-    public boolean canConvert(char ch) {
-        return encodeChar(ch) != UNMAPPABLE_ENCODING;
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteTIS620.java b/src/share/classes/sun/io/CharToByteTIS620.java
deleted file mode 100644
index 9ab8977..0000000
--- a/src/share/classes/sun/io/CharToByteTIS620.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import sun.nio.cs.ext.TIS_620;
-
-/**
- * Tables and data to convert Unicode to TIS620
- *
- * @author  ConverterGenerator tool
- */
-
-public class CharToByteTIS620 extends CharToByteSingleByte {
-
-    private final static TIS_620 nioCoder = new TIS_620();
-
-    public String getCharacterEncoding() {
-        return "TIS620";
-    }
-
-    public CharToByteTIS620() {
-        super.mask1 = 0xFF00;
-        super.mask2 = 0x00FF;
-        super.shift = 8;
-        super.index1 = nioCoder.getEncoderIndex1();
-        super.index2 = nioCoder.getEncoderIndex2();
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteUTF16.java b/src/share/classes/sun/io/CharToByteUTF16.java
deleted file mode 100644
index bebdda2..0000000
--- a/src/share/classes/sun/io/CharToByteUTF16.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-
-/**
- * Convert arrays containing Unicode characters into arrays of bytes, using
- * big-endian byte order and writing an initial byte-order mark.
- */
-
-public class CharToByteUTF16 extends CharToByteUnicode {
-
-    public CharToByteUTF16() {
-        super(BIG, true);
-    }
-
-    public String getCharacterEncoding() {
-        return "UTF-16";
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteUTF8.java b/src/share/classes/sun/io/CharToByteUTF8.java
deleted file mode 100644
index b25a2f2..0000000
--- a/src/share/classes/sun/io/CharToByteUTF8.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 1996, 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.io;
-
-
-/**
- * UCS2 (UTF16) -> UCS Transformation Format 8 (UTF-8) converter
- * It's represented like below.
- *
- * # Bits   Bit pattern
- * 1    7   0xxxxxxx
- * 2   11   110xxxxx 10xxxxxx
- * 3   16   1110xxxx 10xxxxxx 10xxxxxx
- * 4   21   11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
- * 5   26   111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
- * 6   31   1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
- *
- *     UCS2 uses 1-3 / UTF16 uses 1-4 / UCS4 uses 1-6
- */
-
-public class CharToByteUTF8 extends CharToByteConverter {
-
-    private char highHalfZoneCode;
-
-    public int flush(byte[] output, int outStart, int outEnd)
-        throws MalformedInputException
-    {
-        if (highHalfZoneCode != 0) {
-            highHalfZoneCode = 0;
-            badInputLength = 0;
-            throw new MalformedInputException();
-        }
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    /**
-     * Character conversion
-     */
-    public int convert(char[] input, int inOff, int inEnd,
-                       byte[] output, int outOff, int outEnd)
-        throws ConversionBufferFullException, MalformedInputException
-    {
-        char inputChar;
-        byte[] outputByte = new byte[6];
-        int inputSize;
-        int outputSize;
-
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (highHalfZoneCode != 0) {
-            inputChar = highHalfZoneCode;
-            highHalfZoneCode = 0;
-            if (input[inOff] >= 0xdc00 && input[inOff] <= 0xdfff) {
-                // This is legal UTF16 sequence.
-                int ucs4 = (highHalfZoneCode - 0xd800) * 0x400
-                    + (input[inOff] - 0xdc00) + 0x10000;
-                output[0] = (byte)(0xf0 | ((ucs4 >> 18)) & 0x07);
-                output[1] = (byte)(0x80 | ((ucs4 >> 12) & 0x3f));
-                output[2] = (byte)(0x80 | ((ucs4 >> 6) & 0x3f));
-                output[3] = (byte)(0x80 | (ucs4 & 0x3f));
-                charOff++;
-                highHalfZoneCode = 0;
-            } else {
-                // This is illegal UTF16 sequence.
-                badInputLength = 0;
-                throw new MalformedInputException();
-            }
-        }
-
-        while(charOff < inEnd) {
-            inputChar = input[charOff];
-            if (inputChar < 0x80) {
-                outputByte[0] = (byte)inputChar;
-                inputSize = 1;
-                outputSize = 1;
-            } else if (inputChar < 0x800) {
-                outputByte[0] = (byte)(0xc0 | ((inputChar >> 6) & 0x1f));
-                outputByte[1] = (byte)(0x80 | (inputChar & 0x3f));
-                inputSize = 1;
-                outputSize = 2;
-            } else if (inputChar >= 0xd800 && inputChar <= 0xdbff) {
-                // this is <high-half zone code> in UTF-16
-                if (charOff + 1 >= inEnd) {
-                    highHalfZoneCode = inputChar;
-                    break;
-                }
-                // check next char is valid <low-half zone code>
-                char lowChar = input[charOff + 1];
-                if (lowChar < 0xdc00 || lowChar > 0xdfff) {
-                    badInputLength = 1;
-                    throw new MalformedInputException();
-                }
-                int ucs4 = (inputChar - 0xd800) * 0x400 + (lowChar - 0xdc00)
-                    + 0x10000;
-                outputByte[0] = (byte)(0xf0 | ((ucs4 >> 18)) & 0x07);
-                outputByte[1] = (byte)(0x80 | ((ucs4 >> 12) & 0x3f));
-                outputByte[2] = (byte)(0x80 | ((ucs4 >> 6) & 0x3f));
-                outputByte[3] = (byte)(0x80 | (ucs4 & 0x3f));
-                outputSize = 4;
-                inputSize = 2;
-            } else {
-                outputByte[0] = (byte)(0xe0 | ((inputChar >> 12)) & 0x0f);
-                outputByte[1] = (byte)(0x80 | ((inputChar >> 6) & 0x3f));
-                outputByte[2] = (byte)(0x80 | (inputChar & 0x3f));
-                inputSize = 1;
-                outputSize = 3;
-            }
-            if (byteOff + outputSize > outEnd) {
-                throw new ConversionBufferFullException();
-            }
-            for (int i = 0; i < outputSize; i++) {
-                output[byteOff++] = outputByte[i];
-            }
-            charOff += inputSize;
-        }
-        return byteOff - outOff;
-    }
-
-    public boolean canConvert(char ch) {
-        return true;
-    }
-
-    public int getMaxBytesPerChar() {
-        return 3;
-    }
-
-    public void reset() {
-        byteOff = charOff = 0;
-        highHalfZoneCode = 0;
-    }
-
-    public String getCharacterEncoding() {
-        return "UTF8";
-    }
-}
diff --git a/src/share/classes/sun/io/CharToByteUnicode.java b/src/share/classes/sun/io/CharToByteUnicode.java
deleted file mode 100644
index d7b19e1..0000000
--- a/src/share/classes/sun/io/CharToByteUnicode.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-import java.io.*;
-
-
-/**
- * Convert arrays containing Unicode characters into arrays of bytes, using the
- * platform-default byte order.
- *
- * @author      Mark Reinhold
- */
-
-public class CharToByteUnicode extends CharToByteConverter {
-
-    static final char BYTE_ORDER_MARK = (char) 0xfeff;
-    protected boolean usesMark = true;      /* A mark should be written */
-    private boolean markWritten = false;  /* A mark has been written */
-
-    static final int UNKNOWN = 0;
-    static final int BIG = 1;
-    static final int LITTLE = 2;
-    protected int byteOrder = UNKNOWN;
-
-    public CharToByteUnicode() {
-        String enc = java.security.AccessController.doPrivileged(
-           new sun.security.action.GetPropertyAction("sun.io.unicode.encoding",
-                                                          "UnicodeBig"));
-        if (enc.equals("UnicodeBig"))
-            byteOrder = BIG;
-        else if (enc.equals("UnicodeLittle"))
-            byteOrder = LITTLE;
-        else
-            byteOrder = BIG;
-    }
-
-    public CharToByteUnicode(int byteOrder, boolean usesMark) {
-        this.byteOrder = byteOrder;
-        this.usesMark = usesMark;
-    }
-
-    public CharToByteUnicode(boolean usesMark) {
-        this();
-        this.usesMark = usesMark;
-    }
-
-    public String getCharacterEncoding() {
-        switch (byteOrder) {
-        case BIG:
-            return usesMark ? "UnicodeBig" : "UnicodeBigUnmarked";
-        case LITTLE:
-            return usesMark ? "UnicodeLittle" : "UnicodeLittleUnmarked";
-        default:
-            return "UnicodeUnknown";
-        }
-    }
-
-    public int convert(char in[], int inOff, int inEnd,
-                       byte out[], int outOff, int outEnd)
-        throws ConversionBufferFullException, MalformedInputException
-    {
-        charOff = inOff;
-        byteOff = outOff;
-
-        if (inOff >= inEnd)
-            return 0;
-
-        int inI = inOff,
-            outI = outOff,
-            outTop = outEnd - 2;
-
-        if (usesMark && !markWritten) {
-            if (outI > outTop)
-                throw new ConversionBufferFullException();
-            if (byteOrder == BIG) {
-                out[outI++] = (byte) (BYTE_ORDER_MARK >> 8);
-                out[outI++] = (byte) (BYTE_ORDER_MARK & 0xff);
-            }
-            else {
-                out[outI++] = (byte) (BYTE_ORDER_MARK & 0xff);
-                out[outI++] = (byte) (BYTE_ORDER_MARK >> 8);
-            }
-            markWritten = true;
-        }
-
-        if (byteOrder == BIG) {
-            while (inI < inEnd) {
-                if (outI > outTop) {
-                    charOff = inI;
-                    byteOff = outI;
-                    throw new ConversionBufferFullException();
-                }
-                char c = in[inI++];
-                out[outI++] = (byte) (c >> 8);
-                out[outI++] = (byte) (c & 0xff);
-            }
-        }
-        else {
-            while (inI < inEnd) {
-                if (outI > outTop) {
-                    charOff = inI;
-                    byteOff = outI;
-                    throw new ConversionBufferFullException();
-                }
-                char c = in[inI++];
-                out[outI++] = (byte) (c & 0xff);
-                out[outI++] = (byte) (c >> 8);
-            }
-        }
-
-        charOff = inI;
-        byteOff = outI;
-        return outI - outOff;
-    }
-
-    public int flush(byte in[], int inOff, int inEnd) {
-        byteOff = charOff = 0;
-        return 0;
-    }
-
-    public void reset () {
-        byteOff = charOff = 0;
-        markWritten = false;
-    }
-
-    public int getMaxBytesPerChar() {
-        return 4;               /* To allow for writing the byte-order mark */
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteUnicodeBig.java b/src/share/classes/sun/io/CharToByteUnicodeBig.java
deleted file mode 100644
index c1c3892..0000000
--- a/src/share/classes/sun/io/CharToByteUnicodeBig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-
-/**
- * Convert arrays containing Unicode characters into arrays of bytes, using
- * big-endian byte order.
- *
- * @author      Mark Reinhold
- */
-
-public class CharToByteUnicodeBig extends CharToByteUnicode {
-
-    public CharToByteUnicodeBig () {
-        byteOrder = BIG;
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteUnicodeBigUnmarked.java b/src/share/classes/sun/io/CharToByteUnicodeBigUnmarked.java
deleted file mode 100644
index d6a7d27..0000000
--- a/src/share/classes/sun/io/CharToByteUnicodeBigUnmarked.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-
-/**
- * Convert arrays containing Unicode characters into arrays of bytes, using
- * big-endian byte order; do not write a byte-order mark before the first
- * converted character.
- *
- * @author      Mark Reinhold
- */
-
-public class CharToByteUnicodeBigUnmarked extends CharToByteUnicode {
-
-    public CharToByteUnicodeBigUnmarked () {
-        byteOrder = BIG;
-        usesMark = false;
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteUnicodeLittle.java b/src/share/classes/sun/io/CharToByteUnicodeLittle.java
deleted file mode 100644
index d734571..0000000
--- a/src/share/classes/sun/io/CharToByteUnicodeLittle.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-
-/**
- * Convert arrays containing Unicode characters into arrays of bytes, using
- * little-endian byte order.
- *
- * @author      Mark Reinhold
- */
-
-public class CharToByteUnicodeLittle extends CharToByteUnicode {
-
-    public CharToByteUnicodeLittle () {
-        byteOrder = LITTLE;
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharToByteUnicodeLittleUnmarked.java b/src/share/classes/sun/io/CharToByteUnicodeLittleUnmarked.java
deleted file mode 100644
index 7595159..0000000
--- a/src/share/classes/sun/io/CharToByteUnicodeLittleUnmarked.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-
-/**
- * Convert arrays containing Unicode characters into arrays of bytes, using
- * little-endian byte order; do not write a byte-order mark before the first
- * converted character.
- *
- * @author      Mark Reinhold
- */
-
-public class CharToByteUnicodeLittleUnmarked extends CharToByteUnicode {
-
-    public CharToByteUnicodeLittleUnmarked () {
-        byteOrder = LITTLE;
-        usesMark = false;
-    }
-
-}
diff --git a/src/share/classes/sun/io/CharacterEncoding.java b/src/share/classes/sun/io/CharacterEncoding.java
deleted file mode 100644
index f577a9b..0000000
--- a/src/share/classes/sun/io/CharacterEncoding.java
+++ /dev/null
@@ -1,900 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import sun.security.action.GetPropertyAction;
-
-/*
- * This class is public in sun.io, so other sun.* packages (such as
- * HotJava) can use it, without exposing it to java.*.
- * Translates IANA encoding name to the string which is the part of
- * converter class.
- */
-
-/**
- * @deprecated Replaced by {@link java.nio.charset}.  THIS API WILL BE
- * REMOVED IN J2SE 1.6.
- */
-@Deprecated
-public class CharacterEncoding {
-
-    private static boolean sjisIsMS932;
-
-    private static Map<String,String> aliasTable;
-    private static volatile boolean installedAll;
-
-    static {
-        aliasTable = new HashMap<>(460, 1.0f);                    /* MDA */
-
-        aliasTable.put("us-ascii",              "ASCII");
-        aliasTable.put("ascii",                 "ASCII");
-        aliasTable.put("646",                   "ASCII");       // Solaris POSIX locale
-        aliasTable.put("iso_646.irv:1983",      "ASCII");       // Linux POSIX locale
-        aliasTable.put("ansi_x3.4-1968",        "ASCII");       // Caldera linux
-        aliasTable.put("iso646-us",             "ASCII");
-        aliasTable.put("default",               "ASCII");       // compatibility with obsolete "Default" converters
-        aliasTable.put("ascii7",                "ASCII");       // compatibility with obsolete "Default" converters
-
-        // Core encodings
-        aliasTable.put("8859_1",                "ISO8859_1");
-        aliasTable.put("iso8859_1",             "ISO8859_1");
-        aliasTable.put("utf-8",                 "UTF8");
-        aliasTable.put("utf8",                  "UTF8");
-        aliasTable.put("utf-16le",              "UnicodeLittleUnmarked");
-
-        // Standard encodings used on Solaris and Linux
-        aliasTable.put("iso8859-1",             "ISO8859_1");
-        aliasTable.put("iso8859-2",             "ISO8859_2");
-        aliasTable.put("iso8859-4",             "ISO8859_4");
-        aliasTable.put("iso8859-5",             "ISO8859_5");
-        aliasTable.put("iso8859-6",             "ISO8859_6");
-        aliasTable.put("iso8859-8",             "ISO8859_8");
-        aliasTable.put("iso8859-9",             "ISO8859_9");
-        aliasTable.put("iso8859-13",            "ISO8859_13");
-        aliasTable.put("iso8859-15",            "ISO8859_15");
-        aliasTable.put("5601",                  "EUC_KR");
-        aliasTable.put("ansi-1251",             "Cp1251");
-        aliasTable.put("big5",                  "Big5");
-        aliasTable.put("big5hk",                "Big5_HKSCS");
-        aliasTable.put("eucjp",                 "EUC_JP");
-        aliasTable.put("cns11643",              "EUC_TW");
-        aliasTable.put("gb2312",                "EUC_CN");
-        aliasTable.put("gb18030",               "GB18030");
-        aliasTable.put("gbk",                   "GBK");
-        aliasTable.put("koi8-r",                "KOI8_R");
-        aliasTable.put("tis620.2533",           "TIS620");
-
-        // Windows encodings
-        aliasTable.put("cp1250",                "Cp1250");
-        aliasTable.put("cp1251",                "Cp1251");
-        aliasTable.put("cp1252",                "Cp1252");
-        aliasTable.put("cp1253",                "Cp1253");
-        aliasTable.put("cp1254",                "Cp1254");
-        aliasTable.put("cp1255",                "Cp1255");
-        aliasTable.put("cp1256",                "Cp1256");
-        aliasTable.put("cp1257",                "Cp1257");
-        aliasTable.put("cp1258",                "Cp1258");
-        aliasTable.put("ms874",                 "MS874");
-        aliasTable.put("ms932",                 "MS932");
-        aliasTable.put("ms949",                 "MS949");
-        aliasTable.put("ms950",                 "MS950");
-        aliasTable.put("ms1361",                "MS1361");
-    }
-
-    public static String aliasName(String name){
-
-        if (name.startsWith("\1")) {
-            // Emergency access to old converters
-            name = name.substring(1);
-        }
-        // need to use Locale.US so we can load ISO converters in tr_TR locale
-        String lower = name.toLowerCase(Locale.US);
-        String val = aliasTable.get(lower);
-
-        if (val == null && !installedAll) {
-            installAll();
-            val = aliasTable.get(lower);
-        }
-        return val;
-    }
-
-    private static synchronized void installAll() {
-        if (!installedAll) {
-            GetPropertyAction a = new GetPropertyAction("sun.nio.cs.map");
-            String map = AccessController.doPrivileged(a);
-            if (map != null) {
-                sjisIsMS932 = map.equalsIgnoreCase("Windows-31J/Shift_JIS");
-            } else {
-                sjisIsMS932 = false;
-            }
-
-            // MIBenum: 4
-            aliasTable.put("8859_1",                "ISO8859_1");
-            aliasTable.put("iso_8859-1:1987",       "ISO8859_1");
-            aliasTable.put("iso-ir-100",            "ISO8859_1");
-            aliasTable.put("iso_8859-1",            "ISO8859_1");
-            aliasTable.put("iso-8859-1",            "ISO8859_1");
-            aliasTable.put("iso8859-1",             "ISO8859_1");
-            aliasTable.put("latin1",                "ISO8859_1");
-            aliasTable.put("l1",                    "ISO8859_1");
-            aliasTable.put("ibm819",                "ISO8859_1");
-            aliasTable.put("ibm-819",               "ISO8859_1");
-            aliasTable.put("cp819",                 "ISO8859_1");
-            aliasTable.put("819",                   "ISO8859_1");
-            aliasTable.put("csisolatin1",           "ISO8859_1");
-
-            // MIBenum: 5
-            aliasTable.put("8859_2",                "ISO8859_2");
-            aliasTable.put("iso_8859-2:1987",       "ISO8859_2");
-            aliasTable.put("iso-ir-101",            "ISO8859_2");
-            aliasTable.put("iso_8859-2",            "ISO8859_2");
-            aliasTable.put("iso-8859-2",            "ISO8859_2");
-            aliasTable.put("iso8859-2",             "ISO8859_2");
-            aliasTable.put("latin2",                "ISO8859_2");
-            aliasTable.put("l2",                    "ISO8859_2");
-            aliasTable.put("ibm912",                "ISO8859_2");
-            aliasTable.put("ibm-912",               "ISO8859_2");
-            aliasTable.put("cp912",                 "ISO8859_2");
-            aliasTable.put("912",                   "ISO8859_2");
-            aliasTable.put("csisolatin2",           "ISO8859_2");
-
-            // MIBenum: 6
-            aliasTable.put("8859_3",                "ISO8859_3");
-            aliasTable.put("iso_8859-3:1988",       "ISO8859_3");
-            aliasTable.put("iso-ir-109",            "ISO8859_3");
-            aliasTable.put("iso_8859-3",            "ISO8859_3");
-            aliasTable.put("iso-8859-3",            "ISO8859_3");
-            aliasTable.put("iso8859-3",             "ISO8859_3");
-            aliasTable.put("latin3",                "ISO8859_3");
-            aliasTable.put("l3",                    "ISO8859_3");
-            aliasTable.put("ibm913",                "ISO8859_3");
-            aliasTable.put("ibm-913",               "ISO8859_3");
-            aliasTable.put("cp913",                 "ISO8859_3");
-            aliasTable.put("913",                   "ISO8859_3");
-            aliasTable.put("csisolatin3",           "ISO8859_3");
-
-            // MIBenum: 7
-            aliasTable.put("8859_4",                "ISO8859_4");
-            aliasTable.put("iso_8859-4:1988",       "ISO8859_4");
-            aliasTable.put("iso-ir-110",            "ISO8859_4");
-            aliasTable.put("iso_8859-4",            "ISO8859_4");
-            aliasTable.put("iso-8859-4",            "ISO8859_4");
-            aliasTable.put("iso8859-4",             "ISO8859_4");
-            aliasTable.put("latin4",                "ISO8859_4");
-            aliasTable.put("l4",                    "ISO8859_4");
-            aliasTable.put("ibm914",                "ISO8859_4");
-            aliasTable.put("ibm-914",               "ISO8859_4");
-            aliasTable.put("cp914",                 "ISO8859_4");
-            aliasTable.put("914",                   "ISO8859_4");
-            aliasTable.put("csisolatin4",           "ISO8859_4");
-
-            // MIBenum: 8
-            aliasTable.put("8859_5",                "ISO8859_5");
-            aliasTable.put("iso_8859-5:1988",       "ISO8859_5");
-            aliasTable.put("iso-ir-144",            "ISO8859_5");
-            aliasTable.put("iso_8859-5",            "ISO8859_5");
-            aliasTable.put("iso-8859-5",            "ISO8859_5");
-            aliasTable.put("iso8859-5",             "ISO8859_5");
-            aliasTable.put("cyrillic",              "ISO8859_5");
-            aliasTable.put("csisolatincyrillic",    "ISO8859_5");
-            aliasTable.put("ibm915",                "ISO8859_5");
-            aliasTable.put("ibm-915",               "ISO8859_5");
-            aliasTable.put("cp915",                 "ISO8859_5");
-            aliasTable.put("915",                   "ISO8859_5");
-
-            // MIBenum: 9
-            aliasTable.put("8859_6",                "ISO8859_6");
-            aliasTable.put("iso_8859-6:1987",       "ISO8859_6");
-            aliasTable.put("iso-ir-127",            "ISO8859_6");
-            aliasTable.put("iso_8859-6",            "ISO8859_6");
-            aliasTable.put("iso-8859-6",            "ISO8859_6");
-            aliasTable.put("iso8859-6",             "ISO8859_6");
-            aliasTable.put("ecma-114",              "ISO8859_6");
-            aliasTable.put("asmo-708",              "ISO8859_6");
-            aliasTable.put("arabic",                "ISO8859_6");
-            aliasTable.put("csisolatinarabic",      "ISO8859_6");
-            aliasTable.put("ibm1089",               "ISO8859_6");
-            aliasTable.put("ibm-1089",              "ISO8859_6");
-            aliasTable.put("cp1089",                "ISO8859_6");
-            aliasTable.put("1089",                  "ISO8859_6");
-
-            // MIBenum: 10
-            aliasTable.put("8859_7",                "ISO8859_7");
-            aliasTable.put("iso_8859-7:1987",       "ISO8859_7");
-            aliasTable.put("iso-ir-126",            "ISO8859_7");
-            aliasTable.put("iso_8859-7",            "ISO8859_7");
-            aliasTable.put("iso-8859-7",            "ISO8859_7");
-            aliasTable.put("iso8859-7",             "ISO8859_7");
-            aliasTable.put("elot_928",              "ISO8859_7");
-            aliasTable.put("ecma-118",              "ISO8859_7");
-            aliasTable.put("greek",                 "ISO8859_7");
-            aliasTable.put("greek8",                "ISO8859_7");
-            aliasTable.put("csisolatingreek",       "ISO8859_7");
-            aliasTable.put("ibm813",                "ISO8859_7");
-            aliasTable.put("ibm-813",               "ISO8859_7");
-            aliasTable.put("cp813",                 "ISO8859_7");
-            aliasTable.put("813",                   "ISO8859_7");
-            aliasTable.put("sun_eu_greek",          "ISO8859_7");
-
-            // MIBenum: 11
-            aliasTable.put("8859_8",                "ISO8859_8");
-            aliasTable.put("iso_8859-8:1988",       "ISO8859_8");
-            aliasTable.put("iso-ir-138",            "ISO8859_8");
-            aliasTable.put("iso_8859-8",            "ISO8859_8");
-            aliasTable.put("iso-8859-8",            "ISO8859_8");
-            aliasTable.put("iso8859-8",             "ISO8859_8");
-            aliasTable.put("hebrew",                "ISO8859_8");
-            aliasTable.put("csisolatinhebrew",      "ISO8859_8");
-            aliasTable.put("ibm916",                "ISO8859_8");
-            aliasTable.put("ibm-916",               "ISO8859_8");
-            aliasTable.put("cp916",                 "ISO8859_8");
-            aliasTable.put("916",                   "ISO8859_8");
-
-            // MIBenum: 12
-            aliasTable.put("8859_9",                "ISO8859_9");
-            aliasTable.put("iso-ir-148",            "ISO8859_9");
-            aliasTable.put("iso_8859-9",            "ISO8859_9");
-            aliasTable.put("iso-8859-9",            "ISO8859_9");
-            aliasTable.put("iso8859-9",             "ISO8859_9");
-            aliasTable.put("latin5",                "ISO8859_9");
-            aliasTable.put("l5",                    "ISO8859_9");
-            aliasTable.put("ibm920",                "ISO8859_9");
-            aliasTable.put("ibm-920",               "ISO8859_9");
-            aliasTable.put("cp920",                 "ISO8859_9");
-            aliasTable.put("920",                   "ISO8859_9");
-            aliasTable.put("csisolatin5",           "ISO8859_9");
-
-            // MIBenum: ???
-            aliasTable.put("8859_13",               "ISO8859_13");
-            aliasTable.put("iso_8859-13",           "ISO8859_13");
-            aliasTable.put("iso-8859-13",           "ISO8859_13");
-            aliasTable.put("iso8859-13",            "ISO8859_13");
-
-
-            // MIBenum: ????
-            aliasTable.put("8859_15",               "ISO8859_15");
-            aliasTable.put("iso-8859-15",           "ISO8859_15");
-            aliasTable.put("iso_8859-15",           "ISO8859_15");
-            aliasTable.put("iso8859-15",            "ISO8859_15");
-            aliasTable.put("ibm923",                "ISO8859_15");
-            aliasTable.put("ibm-923",               "ISO8859_15");
-            aliasTable.put("cp923",                 "ISO8859_15");
-            aliasTable.put("923",                   "ISO8859_15");
-            aliasTable.put("latin0",                "ISO8859_15");
-            aliasTable.put("latin9",                "ISO8859_15");
-            aliasTable.put("csisolatin0",           "ISO8859_15");
-            aliasTable.put("csisolatin9",           "ISO8859_15");
-
-            //For compatibility purpose
-            aliasTable.put("iso8859_15_fdis",       "ISO8859_15");
-
-            // MIBenum: 106
-            aliasTable.put("utf-8",                 "UTF8");
-
-            // Alias recommended in RFC 1641
-            aliasTable.put("unicode-1-1-utf-8",     "UTF8");
-
-            // MIBenum: 1010
-            aliasTable.put("unicode-1-1",           "UnicodeBigUnmarked");
-
-            // MIBenum: 1000
-            aliasTable.put("iso-10646-ucs-2",       "UnicodeBigUnmarked");
-
-            // Per Unicode standard
-            aliasTable.put("utf-16be",              "UnicodeBigUnmarked");
-            aliasTable.put("utf-16le",              "UnicodeLittleUnmarked");
-            aliasTable.put("utf-16",                "UTF16");
-
-            // Used by drag-and-drop subsystem
-            aliasTable.put("x-utf-16be",            "UnicodeBigUnmarked");
-            aliasTable.put("x-utf-16le",            "UnicodeLittleUnmarked");
-
-            aliasTable.put("unicode",               "Unicode");
-
-            // MIBenum: ????
-            aliasTable.put("ibm037",                "Cp037");
-            aliasTable.put("ibm-037",               "Cp037");
-            aliasTable.put("cp037",                 "Cp037");
-            aliasTable.put("037",                   "Cp037");
-
-            // MIBenum: ????
-            aliasTable.put("ibm273",                "Cp273");
-            aliasTable.put("ibm-273",               "Cp273");
-            aliasTable.put("cp273",                 "Cp273");
-            aliasTable.put("273",                   "Cp273");
-
-            // MIBenum: ????
-            aliasTable.put("ibm277",                "Cp277");
-            aliasTable.put("ibm-277",               "Cp277");
-            aliasTable.put("cp277",                 "Cp277");
-            aliasTable.put("277",                   "Cp277");
-
-            // MIBenum: ????
-            aliasTable.put("ibm278",                "Cp278");
-            aliasTable.put("ibm-278",               "Cp278");
-            aliasTable.put("cp278",                 "Cp278");
-            aliasTable.put("278",                   "Cp278");
-
-            // MIBenum: ????
-            aliasTable.put("ibm280",                "Cp280");
-            aliasTable.put("ibm-280",               "Cp280");
-            aliasTable.put("cp280",                 "Cp280");
-            aliasTable.put("280",                   "Cp280");
-
-            // MIBenum: ????
-            aliasTable.put("ibm284",                "Cp284");
-            aliasTable.put("ibm-284",               "Cp284");
-            aliasTable.put("cp284",                 "Cp284");
-            aliasTable.put("284",                   "Cp284");
-
-            // MIBenum: ????
-            aliasTable.put("ibm285",                "Cp285");
-            aliasTable.put("ibm-285",               "Cp285");
-            aliasTable.put("cp285",                 "Cp285");
-            aliasTable.put("285",                   "Cp285");
-
-            // MIBenum: ????
-            aliasTable.put("ibm297",                "Cp297");
-            aliasTable.put("ibm-297",               "Cp297");
-            aliasTable.put("cp297",                 "Cp297");
-            aliasTable.put("297",                   "Cp297");
-
-            // MIBenum: ????
-            aliasTable.put("ibm420",                "Cp420");
-            aliasTable.put("ibm-420",               "Cp420");
-            aliasTable.put("cp420",                 "Cp420");
-            aliasTable.put("420",                   "Cp420");
-
-            // MIBenum: ????
-            aliasTable.put("ibm424",                "Cp424");
-            aliasTable.put("ibm-424",               "Cp424");
-            aliasTable.put("cp424",                 "Cp424");
-            aliasTable.put("424",                   "Cp424");
-
-            // MIBenum: 2011
-            aliasTable.put("ibm437",                "Cp437");
-            aliasTable.put("ibm-437",               "Cp437");
-            aliasTable.put("cp437",                 "Cp437");
-            aliasTable.put("437",                   "Cp437");
-            aliasTable.put("cspc8codepage437",      "Cp437");
-
-            // MIBenum: ????
-            aliasTable.put("ibm500",                "Cp500");
-            aliasTable.put("ibm-500",               "Cp500");
-            aliasTable.put("cp500",                 "Cp500");
-            aliasTable.put("500",                   "Cp500");
-
-            // MIBenum: ????
-            aliasTable.put("ibm737",                "Cp737");
-            aliasTable.put("ibm-737",               "Cp737");
-            aliasTable.put("cp737",                 "Cp737");
-            aliasTable.put("737",                   "Cp737");
-
-            // MIBenum: ????
-            aliasTable.put("ibm775",                "Cp775");
-            aliasTable.put("ibm-775",               "Cp775");
-            aliasTable.put("cp775",                 "Cp775");
-            aliasTable.put("775",                   "Cp775");
-
-            aliasTable.put("ibm833",                "Cp833");
-            aliasTable.put("ibm-833",               "Cp833");
-            aliasTable.put("cp833",                 "Cp833");
-            aliasTable.put("833",                   "Cp833");
-
-            aliasTable.put("ibm834",                "Cp834");
-            aliasTable.put("ibm-834",               "Cp834");
-            aliasTable.put("cp834",                 "Cp834");
-            aliasTable.put("834",                   "Cp834");
-
-            // MIBenum: ????
-            aliasTable.put("ibm838",                "Cp838");         /* MDA */
-            aliasTable.put("ibm-838",               "Cp838");         /* MDA */
-            aliasTable.put("cp838",                 "Cp838");         /* MDA */
-            aliasTable.put("838",                   "Cp838");         /* MDA */
-
-            // "Cp850"
-            // MIBenum: 2009
-            aliasTable.put("ibm850",                "Cp850");
-            aliasTable.put("ibm-850",               "Cp850");
-            aliasTable.put("cp850",                 "Cp850");
-            aliasTable.put("850",                   "Cp850");
-            aliasTable.put("cspc850multilingual",   "Cp850");
-
-            // "Cp852"
-            // MIBenum: 2010
-            aliasTable.put("ibm852",                "Cp852");
-            aliasTable.put("ibm-852",               "Cp852");
-            aliasTable.put("cp852",                 "Cp852");
-            aliasTable.put("852",                   "Cp852");
-            aliasTable.put("cspcp852",              "Cp852");
-
-            // "Cp855"
-            // MIBenum: 2046
-            aliasTable.put("ibm855",                "Cp855");
-            aliasTable.put("ibm-855",               "Cp855");
-            aliasTable.put("cp855",                 "Cp855");
-            aliasTable.put("855",                   "Cp855");
-            aliasTable.put("cspcp855",              "Cp855");
-
-            // "Cp855"
-            // MIBenum: ???
-            aliasTable.put("ibm856",                "Cp856");
-            aliasTable.put("ibm-856",               "Cp856");
-            aliasTable.put("cp856",                 "Cp856");
-            aliasTable.put("856",                   "Cp856");
-
-            // "Cp857"
-            // MIBenum: 2047
-            aliasTable.put("ibm857",                "Cp857");
-            aliasTable.put("ibm-857",               "Cp857");
-            aliasTable.put("cp857",                 "Cp857");
-            aliasTable.put("857",                   "Cp857");
-            aliasTable.put("csibm857",              "Cp857");
-
-            // "Cp860"
-            // MIBenum: 2048
-            aliasTable.put("ibm860",                "Cp860");
-            aliasTable.put("ibm-860",               "Cp860");
-            aliasTable.put("cp860",                 "Cp860");
-            aliasTable.put("860",                   "Cp860");
-            aliasTable.put("csibm860",              "Cp860");
-
-            // MIBenum: 2049
-            aliasTable.put("ibm861",                "Cp861");
-            aliasTable.put("ibm-861",               "Cp861");
-            aliasTable.put("cp861",                 "Cp861");
-            aliasTable.put("cp-is",                 "Cp861");
-            aliasTable.put("861",                   "Cp861");
-            aliasTable.put("csibm861",              "Cp861");
-
-            // MIBenum: 2013
-            aliasTable.put("ibm862",                "Cp862");
-            aliasTable.put("ibm-862",               "Cp862");
-            aliasTable.put("cp862",                 "Cp862");
-            aliasTable.put("862",                   "Cp862");
-            aliasTable.put("cspc862latinhebrew",    "Cp862");
-
-            // MIBenum: 2050
-            aliasTable.put("ibm863",                "Cp863");
-            aliasTable.put("ibm-863",               "Cp863");
-            aliasTable.put("cp863",                 "Cp863");
-            aliasTable.put("863",                   "Cp863");
-            aliasTable.put("csibm863",              "Cp863");
-
-            // MIBenum: 2051
-            aliasTable.put("ibm864",                "Cp864");
-            aliasTable.put("ibm-864",               "Cp864");
-            aliasTable.put("cp864",                 "Cp864");
-            aliasTable.put("csibm864",              "Cp864");
-
-            // MIBenum: 2052
-            aliasTable.put("ibm865",                "Cp865");
-            aliasTable.put("ibm-865",               "Cp865");
-            aliasTable.put("cp865",                 "Cp865");
-            aliasTable.put("865",                   "Cp865");
-            aliasTable.put("csibm865",              "Cp865");
-
-            // MIBenum: ????
-            aliasTable.put("ibm866",                "Cp866");
-            aliasTable.put("ibm-866",               "Cp866");
-            aliasTable.put("cp866",                 "Cp866");
-            aliasTable.put("866",                   "Cp866");
-            aliasTable.put("csibm866",              "Cp866");
-
-            // MIBenum: ????
-            aliasTable.put("ibm868",                "Cp868");
-            aliasTable.put("ibm-868",               "Cp868");
-            aliasTable.put("cp868",                 "Cp868");
-            aliasTable.put("868",                   "Cp868");
-
-            // MIBenum: 2054
-            aliasTable.put("ibm869",                "Cp869");
-            aliasTable.put("ibm-869",               "Cp869");
-            aliasTable.put("cp869",                 "Cp869");
-            aliasTable.put("869",                   "Cp869");
-            aliasTable.put("cp-gr",                 "Cp869");
-            aliasTable.put("csibm869",              "Cp869");
-
-            // MIBenum: ????
-            aliasTable.put("ibm870",                "Cp870");
-            aliasTable.put("ibm-870",               "Cp870");
-            aliasTable.put("cp870",                 "Cp870");
-            aliasTable.put("870",                   "Cp870");
-
-            // MIBenum: ????
-            aliasTable.put("ibm871",                "Cp871");
-            aliasTable.put("ibm-871",               "Cp871");
-            aliasTable.put("cp871",                 "Cp871");
-            aliasTable.put("871",                   "Cp871");
-
-            // MIBenum: ????
-            aliasTable.put("ibm874",                "Cp874");
-            aliasTable.put("ibm-874",               "Cp874");
-            aliasTable.put("cp874",                 "Cp874");
-            aliasTable.put("874",                   "Cp874");
-
-            // MIBenum: ????
-            aliasTable.put("ibm875",                "Cp875");
-            aliasTable.put("ibm-875",               "Cp875");
-            aliasTable.put("cp875",                 "Cp875");
-            aliasTable.put("875",                   "Cp875");
-
-            // MIBenum: ????
-            aliasTable.put("ibm918",                "Cp918");
-            aliasTable.put("ibm-918",               "Cp918");
-            aliasTable.put("cp918",                 "Cp918");
-            aliasTable.put("918",                   "Cp918");
-
-            // MIBenum: ????
-            aliasTable.put("ibm921",                "Cp921");
-            aliasTable.put("ibm-921",               "Cp921");
-            aliasTable.put("cp921",                 "Cp921");
-            aliasTable.put("921",                   "Cp921");
-
-            // MIBenum: ????
-            aliasTable.put("ibm922",                "Cp922");
-            aliasTable.put("ibm-922",               "Cp922");
-            aliasTable.put("cp922",                 "Cp922");
-            aliasTable.put("922",                   "Cp922");
-
-            // MIBenum: ????
-            aliasTable.put("ibm930",                "Cp930");         /* MDA */
-            aliasTable.put("ibm-930",               "Cp930");         /* MDA */
-            aliasTable.put("cp930",                 "Cp930");         /* MDA */
-            aliasTable.put("930",                   "Cp930");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm933",                "Cp933");         /* MDA */
-            aliasTable.put("ibm-933",               "Cp933");         /* MDA */
-            aliasTable.put("cp933",                 "Cp933");         /* MDA */
-            aliasTable.put("933",                   "Cp933");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm935",                "Cp935");         /* MDA */
-            aliasTable.put("ibm-935",               "Cp935");         /* MDA */
-            aliasTable.put("cp935",                 "Cp935");         /* MDA */
-            aliasTable.put("935",                   "Cp935");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm937",                "Cp937");         /* MDA */
-            aliasTable.put("ibm-937",               "Cp937");         /* MDA */
-            aliasTable.put("cp937",                 "Cp937");         /* MDA */
-            aliasTable.put("937",                   "Cp937");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm939",                "Cp939");         /* MDA */
-            aliasTable.put("ibm-939",               "Cp939");         /* MDA */
-            aliasTable.put("cp939",                 "Cp939");         /* MDA */
-            aliasTable.put("939",                   "Cp939");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm942",                "Cp942");         /* MDA */
-            aliasTable.put("ibm-942",               "Cp942");         /* MDA */
-            aliasTable.put("cp942",                 "Cp942");         /* MDA */
-            aliasTable.put("942",                   "Cp942");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm943",                "Cp943");         /* ibm.3158 */
-            aliasTable.put("ibm-943",               "Cp943");         /* ibm.3158 */
-            aliasTable.put("cp943",                 "Cp943");         /* ibm.3158 */
-            aliasTable.put("943",                   "Cp943");         /* ibm.3158 */
-
-            // MIBenum: ????
-            aliasTable.put("ibm948",                "Cp948");         /* MDA */
-            aliasTable.put("ibm-948",               "Cp948");         /* MDA */
-            aliasTable.put("cp948",                 "Cp948");         /* MDA */
-            aliasTable.put("948",                   "Cp948");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm949",                "Cp949");         /* MDA */
-            aliasTable.put("ibm-949",               "Cp949");         /* MDA */
-            aliasTable.put("cp949",                 "Cp949");         /* MDA */
-            aliasTable.put("949",                   "Cp949");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm950",                "Cp950");         /* MDA */
-            aliasTable.put("ibm-950",               "Cp950");         /* MDA */
-            aliasTable.put("cp950",                 "Cp950");         /* MDA */
-            aliasTable.put("950",                   "Cp950");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm964",                "Cp964");         /* MDA */
-            aliasTable.put("ibm-964",               "Cp964");         /* MDA */
-            aliasTable.put("cp964",                 "Cp964");         /* MDA */
-            aliasTable.put("964",                   "Cp964");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm970",                "Cp970");         /* MDA */
-            aliasTable.put("ibm-970",               "Cp970");         /* MDA */
-            aliasTable.put("cp970",                 "Cp970");         /* MDA */
-            aliasTable.put("970",                   "Cp970");         /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm1006",               "Cp1006");
-            aliasTable.put("ibm-1006",              "Cp1006");
-            aliasTable.put("cp1006",                "Cp1006");
-            aliasTable.put("1006",                  "Cp1006");
-
-            // MIBenum: ????
-            aliasTable.put("ibm1025",               "Cp1025");
-            aliasTable.put("ibm-1025",              "Cp1025");
-            aliasTable.put("cp1025",                "Cp1025");
-            aliasTable.put("1025",                  "Cp1025");
-
-            // MIBenum: ????
-            aliasTable.put("ibm1026",               "Cp1026");
-            aliasTable.put("ibm-1026",              "Cp1026");
-            aliasTable.put("cp1026",                "Cp1026");
-            aliasTable.put("1026",                  "Cp1026");
-
-            // MIBenum: ????
-            aliasTable.put("ibm1097",               "Cp1097");
-            aliasTable.put("ibm-1097",              "Cp1097");
-            aliasTable.put("cp1097",                "Cp1097");
-            aliasTable.put("1097",                  "Cp1097");
-
-            // MIBenum: ????
-            aliasTable.put("ibm1098",               "Cp1098");
-            aliasTable.put("ibm-1098",              "Cp1098");
-            aliasTable.put("cp1098",                "Cp1098");
-            aliasTable.put("1098",                  "Cp1098");
-
-            // MIBenum: ????
-            aliasTable.put("ibm1112",               "Cp1112");
-            aliasTable.put("ibm-1112",              "Cp1112");
-            aliasTable.put("cp1112",                "Cp1112");
-            aliasTable.put("1112",                  "Cp1112");
-
-            // MIBenum: ????
-            aliasTable.put("ibm1122",               "Cp1122");
-            aliasTable.put("ibm-1122",              "Cp1122");
-            aliasTable.put("cp1122",                "Cp1122");
-            aliasTable.put("1122",                  "Cp1122");
-
-            // MIBenum: ????
-            aliasTable.put("ibm1123",               "Cp1123");
-            aliasTable.put("ibm-1123",              "Cp1123");
-            aliasTable.put("cp1123",                "Cp1123");
-            aliasTable.put("1123",                  "Cp1123");
-
-            // MIBenum: ????
-            aliasTable.put("ibm1124",               "Cp1124");
-            aliasTable.put("ibm-1124",              "Cp1124");
-            aliasTable.put("cp1124",                "Cp1124");
-            aliasTable.put("1124",                  "Cp1124");
-
-            // MIBenum: ????
-            aliasTable.put("ibm1381",               "Cp1381");        /* MDA */
-            aliasTable.put("ibm-1381",              "Cp1381");        /* MDA */
-            aliasTable.put("cp1381",                "Cp1381");        /* MDA */
-            aliasTable.put("1381",                  "Cp1381");        /* MDA */
-
-            // MIBenum: ????
-            aliasTable.put("ibm1383",               "Cp1383");        /* MDA */
-            aliasTable.put("ibm-1383",              "Cp1383");        /* MDA */
-            aliasTable.put("cp1383",                "Cp1383");        /* MDA */
-            aliasTable.put("1383",                  "Cp1383");        /* MDA */
-
-            // Specialized auto-detection for Japanese charsets
-            aliasTable.put("jis auto detect",       "JISAutoDetect");
-
-            // MIBenum: 16/39
-            aliasTable.put("jis",                   "ISO2022JP");
-            aliasTable.put("iso-2022-jp",           "ISO2022JP");
-            aliasTable.put("csiso2022jp",           "ISO2022JP");
-            aliasTable.put("jis_encoding",          "ISO2022JP");
-            aliasTable.put("csjisencoding",         "ISO2022JP");
-
-            // MIBenum: 17/2024
-            aliasTable.put("windows-31j",           "MS932");
-            aliasTable.put("cswindows31j",          "MS932");
-
-            // JIS-defined Shift JIS
-            aliasTable.put("\u30b7\u30d5\u30c8\u7b26\u53f7\u5316\u8868\u73fe",
-                           "SJIS");                             // JIS name
-            aliasTable.put("pck", "PCK");           // Case independent PCK alias
-
-            if (sjisIsMS932) {
-                aliasTable.put("shift_jis",         "MS932");   // IANA shift jis aliases
-                aliasTable.put("csshiftjis",        "MS932");   // updated per 4556882
-                aliasTable.put("x-sjis",            "MS932");
-                aliasTable.put("ms_kanji",          "MS932");
-            } else {
-                aliasTable.put("shift_jis",         "SJIS");    // IANA shift jis aliases
-                aliasTable.put("csshiftjis",        "SJIS");
-                aliasTable.put("x-sjis",            "SJIS");
-                aliasTable.put("ms_kanji",          "SJIS");
-            }
-
-            // MIBenum: 18
-            // Japanese EUC
-            aliasTable.put("eucjis",                "EUC_JP");
-            aliasTable.put("euc-jp",                "EUC_JP");
-            aliasTable.put("eucjp",                 "EUC_JP");
-            aliasTable.put("extended_unix_code_packed_format_for_japanese",
-                           "EUC_JP");
-            aliasTable.put("cseucpkdfmtjapanese",   "EUC_JP");
-            aliasTable.put("x-euc-jp",              "EUC_JP");
-            aliasTable.put("x-eucjp",               "EUC_JP");
-            aliasTable.put("eucjp-open",            "EUC_JP_Solaris"); // 1.3.1_x compatibility
-
-            // For handing only JIS0202 and JIS0208 in linux
-            aliasTable.put("euc-jp-linux",          "EUC_JP_LINUX");
-
-            // MIBenum: 874
-            aliasTable.put("windows-874",           "MS874");
-
-            // MIBenum: 2250
-            aliasTable.put("windows-1250",          "Cp1250");
-
-            // MIBenum: 2251
-            aliasTable.put("windows-1251",          "Cp1251");
-            aliasTable.put("ansi-1251",             "Cp1251"); // Solaris ru_RU.ANSI1251 locale
-
-            // MIBenum: 2252
-            aliasTable.put("windows-1252",          "Cp1252");
-
-            // MIBenum: 2253
-            aliasTable.put("windows-1253",          "Cp1253");
-
-            // MIBenum: 2254
-            aliasTable.put("windows-1254",          "Cp1254");
-
-            // MIBenum: 2255
-            aliasTable.put("windows-1255",          "Cp1255");
-
-            // MIBenum: 2256
-            aliasTable.put("windows-1256",          "Cp1256");
-
-            // MIBenum: 2257
-            aliasTable.put("windows-1257",          "Cp1257");
-
-            // MIBenum: 2258
-            aliasTable.put("windows-1258",          "Cp1258");
-
-            // MIBenum: ????
-            aliasTable.put("ibm33722",              "Cp33722");       /* MDA */
-            aliasTable.put("ibm-33722",             "Cp33722");       /* MDA */
-            aliasTable.put("cp33722",               "Cp33722");       /* MDA */
-            aliasTable.put("33722",                 "Cp33722");       /* MDA */
-
-            // Russian KOI8-R
-            aliasTable.put("koi8-r",                "KOI8_R");
-            aliasTable.put("koi8",                  "KOI8_R");
-            aliasTable.put("cskoi8r",               "KOI8_R");
-
-            // Simplified Chinese
-            aliasTable.put("gb2312",                "EUC_CN");
-            aliasTable.put("gb2312-80",             "EUC_CN");
-            aliasTable.put("gb2312-1980",           "EUC_CN");
-            aliasTable.put("euc-cn",                "EUC_CN");
-            aliasTable.put("euccn",                 "EUC_CN");
-
-            aliasTable.put("big5",                  "Big5");
-            aliasTable.put("big5hk",                "Big5_HKSCS");
-            aliasTable.put("big5-hkscs",            "Big5_HKSCS");
-            // Added for future compatibility, explicit mapping to Unicode 3.0
-            aliasTable.put("big5-hkscs:unicode3.0", "Big5_HKSCS");
-            aliasTable.put("big5_solaris",          "Big5_Solaris");
-
-            // Traditional Chinese
-            aliasTable.put("cns11643",              "EUC_TW");
-            aliasTable.put("euc-tw",                "EUC_TW");
-            aliasTable.put("euctw",                 "EUC_TW");
-
-            // Korean
-            aliasTable.put("ksc5601",               "EUC_KR");
-            aliasTable.put("euc-kr",                "EUC_KR");
-            aliasTable.put("euckr",                 "EUC_KR");
-            aliasTable.put("ks_c_5601-1987",        "EUC_KR");
-            aliasTable.put("ksc5601-1987",          "EUC_KR");
-            aliasTable.put("ksc5601_1987",          "EUC_KR");
-            aliasTable.put("ksc_5601",              "EUC_KR");
-            aliasTable.put("5601",                  "EUC_KR");
-
-            aliasTable.put("ksc5601-1992",          "Johab");
-            aliasTable.put("ksc5601_1992",          "Johab");
-            aliasTable.put("ms1361",                "Johab");
-
-            aliasTable.put("windows-949",           "MS949");
-
-            //MIBenum: 37
-            aliasTable.put("iso-2022-kr",           "ISO2022KR");
-            aliasTable.put("csiso2022kr",           "ISO2022KR");
-
-            // Thai
-            aliasTable.put("tis620.2533",           "TIS620");
-            aliasTable.put("tis-620",               "TIS620"); // Linux name
-
-            // X11 Compound Text
-            aliasTable.put("x-compound-text",       "COMPOUND_TEXT");
-            aliasTable.put("x11-compound_text",     "COMPOUND_TEXT");
-
-            // Variants
-            aliasTable.put("cp942c", "Cp942C");
-            aliasTable.put("cp943c", "Cp943C");
-            aliasTable.put("cp949c", "Cp949C");
-            aliasTable.put("iscii", "ISCII91");
-
-            installedAll = true;
-        }
-    }
-
-    /**
-     * For Solaris:
-     * always returns "PCK"
-     *
-     * For other platforms:
-     * method returns "MS932" if the file.encoding property value is "MS932"
-     * or an alias of "MS932"
-     * otherwise, "SJIS", regardless of its
-     * actual file.encoding value. This method is called from the JIS
-     * Auto Detect converter.
-     */
-    static String getSJISName() {
-        String encodeName = AccessController.doPrivileged(
-                                               new PrivilegedAction<String>() {
-            public String run() {
-                String osName = System.getProperty("os.name");
-                if (osName.equals("Solaris") || osName.equals("SunOS")){
-                    return "PCK";
-                }
-                else {
-                    return System.getProperty("file.encoding", null);
-                }
-            }
-        });
-
-        if (encodeName != null) {
-            if (encodeName.equals("MS932"))
-                return encodeName;
-            encodeName = aliasName(encodeName);
-        }
-        return (encodeName != null && encodeName.equals("MS932")) ? encodeName : "SJIS";
-    }
-
-
-    static String getEUCJPName() {
-      String encodeName = AccessController.doPrivileged(
-                                              new PrivilegedAction<String>() {
-          public String run() {
-              String osName = System.getProperty("os.name");
-              if (osName.equals("Solaris") || osName.equals("SunOS"))
-                  return "eucJP-open";
-              else
-                  return "EUC_JP";
-          }
-      });
-      return encodeName;
-    }
-}
diff --git a/src/share/classes/sun/io/ConversionBufferFullException.java b/src/share/classes/sun/io/ConversionBufferFullException.java
deleted file mode 100644
index b267a9b..0000000
--- a/src/share/classes/sun/io/ConversionBufferFullException.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-
-/**
- * The output buffer for a character conversion is full, but additional
- * input remains to be converted
- *
- * @author Asmus Freytag
- *
- * @deprecated Replaced by {@link java.nio.charset}.  THIS API WILL BE
- * REMOVED IN J2SE 1.6.
- */
-@Deprecated
-public class ConversionBufferFullException
-    extends java.io.CharConversionException
-{
-    private static final long serialVersionUID = -6537318994265003622L;
-
-    /**
-     * Constructs a BufferFullException with no detail message.
-     * A detail message is a String that describes this particular exception.
-     */
-    public ConversionBufferFullException() {
-        super();
-    }
-
-    /**
-     * Constructs a BufferFullException with the specified detail message.
-     * A detail message is a String that describes this particular exception.
-     * @param s the String containing a detail message
-     */
-    public ConversionBufferFullException(String s) {
-        super(s);
-    }
-}
diff --git a/src/share/classes/sun/io/Converters.java b/src/share/classes/sun/io/Converters.java
deleted file mode 100644
index d09bc1e..0000000
--- a/src/share/classes/sun/io/Converters.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.ref.SoftReference;
-import java.util.Properties;
-
-/**
- * Package-private utility class that caches the default converter classes and
- * provides other logic common to both the ByteToCharConverter and
- * CharToByteConverter classes.
- *
- * @author   Mark Reinhold
- * @since    1.2
- *
- * @deprecated Replaced by {@link java.nio.charset}.  THIS API WILL BE
- * REMOVED IN J2SE 1.6.
- */
-@Deprecated
-public class Converters {
-
-    private Converters() { }    /* To prevent instantiation */
-
-    /* Lock for all static fields in this class */
-    private static Object lock = Converters.class;
-
-    /* Cached values of system properties */
-    private static String converterPackageName = null;  /* file.encoding.pkg */
-    private static String defaultEncoding = null;       /* file.encoding */
-
-    /* Converter type constants and names */
-    public static final int BYTE_TO_CHAR = 0;
-    public static final int CHAR_TO_BYTE = 1;
-    private static final String[] converterPrefix = { "ByteToChar",
-                                                      "CharToByte" };
-
-
-    // -- Converter class cache --
-
-    private static final int CACHE_SIZE = 3;
-
-    /* For the default charset, whatever it turns out to be */
-    private static final Object DEFAULT_NAME = new Object();
-
-    /* Cached converter classes, CACHE_SIZE per converter type.  Each cache
-     * entry is a soft reference to a two-object array; the first element of
-     * the array is the converter class, the second is an object (typically a
-     * string) representing the encoding name that was used to request the
-     * converter, e.g.,
-     *
-     *     ((Object[])classCache[CHAR_TO_BYTE][i].get())[0]
-     *
-     * will be a CharToByteConverter and
-     *
-     *     ((Object[])classCache[CHAR_TO_BYTE][i].get())[1]
-     *
-     * will be the string encoding name used to request it, assuming that cache
-     * entry i is valid.
-     *
-     * Ordinarily we'd do this with a private static utility class, but since
-     * this code can be involved in the startup sequence it's important to keep
-     * the footprint down.
-     */
-    @SuppressWarnings("unchecked")
-    private static SoftReference<Object[]>[][] classCache
-        = (SoftReference<Object[]>[][]) new SoftReference<?>[][] {
-            new SoftReference<?>[CACHE_SIZE],
-            new SoftReference<?>[CACHE_SIZE]
-        };
-
-    private static void moveToFront(Object[] oa, int i) {
-        Object ob = oa[i];
-        for (int j = i; j > 0; j--)
-            oa[j] = oa[j - 1];
-        oa[0] = ob;
-    }
-
-    private static Class<?> cache(int type, Object encoding) {
-        SoftReference<Object[]>[] srs = classCache[type];
-        for (int i = 0; i < CACHE_SIZE; i++) {
-            SoftReference<Object[]> sr = srs[i];
-            if (sr == null)
-                continue;
-            Object[] oa = sr.get();
-            if (oa == null) {
-                srs[i] = null;
-                continue;
-            }
-            if (oa[1].equals(encoding)) {
-                moveToFront(srs, i);
-                return (Class<?>)oa[0];
-            }
-        }
-        return null;
-    }
-
-    private static Class<?> cache(int type, Object encoding, Class<?> c) {
-        SoftReference<Object[]>[] srs = classCache[type];
-        srs[CACHE_SIZE - 1] = new SoftReference<>(new Object[] { c, encoding });
-        moveToFront(srs, CACHE_SIZE - 1);
-        return c;
-    }
-
-    /* Used to avoid doing expensive charset lookups for charsets that are not
-     * yet directly supported by NIO.
-     */
-    public static boolean isCached(int type, String encoding) {
-        synchronized (lock) {
-            SoftReference<Object[]>[] srs = classCache[type];
-            for (int i = 0; i < CACHE_SIZE; i++) {
-                SoftReference<Object[]> sr = srs[i];
-                if (sr == null)
-                    continue;
-                Object[] oa = sr.get();
-                if (oa == null) {
-                    srs[i] = null;
-                    continue;
-                }
-                if (oa[1].equals(encoding))
-                    return true;
-            }
-            return false;
-        }
-    }
-
-
-
-    /** Get the name of the converter package */
-    private static String getConverterPackageName() {
-        String cp = converterPackageName;
-        if (cp != null) return cp;
-        java.security.PrivilegedAction<String> pa =
-            new sun.security.action.GetPropertyAction("file.encoding.pkg");
-        cp = java.security.AccessController.doPrivileged(pa);
-        if (cp != null) {
-            /* Property is set, so take it as the true converter package */
-            converterPackageName = cp;
-        } else {
-            /* Fall back to sun.io */
-            cp = "sun.io";
-        }
-        return cp;
-    }
-
-    public static String getDefaultEncodingName() {
-        synchronized (lock) {
-            if (defaultEncoding == null) {
-                java.security.PrivilegedAction<String> pa =
-                    new sun.security.action.GetPropertyAction("file.encoding");
-                defaultEncoding = java.security.AccessController.doPrivileged(pa);
-            }
-        }
-        return defaultEncoding;
-    }
-
-    public static void resetDefaultEncodingName() {
-        // This method should only be called during VM initialization.
-        if (sun.misc.VM.isBooted())
-            return;
-
-        synchronized (lock) {
-            defaultEncoding = "ISO-8859-1";
-            Properties p = System.getProperties();
-            p.setProperty("file.encoding", defaultEncoding);
-            System.setProperties(p);
-        }
-    }
-
-    /**
-     * Get the class that implements the given type of converter for the named
-     * encoding, or throw an UnsupportedEncodingException if no such class can
-     * be found
-     */
-    private static Class<?> getConverterClass(int type, String encoding)
-        throws UnsupportedEncodingException
-    {
-        String enc = null;
-
-        /* "ISO8859_1" is the canonical name for the ISO-Latin-1 encoding.
-           Native code in the JDK commonly uses the alias "8859_1" instead of
-           "ISO8859_1".  We hardwire this alias here in order to avoid loading
-           the full alias table just for this case. */
-        if (!encoding.equals("ISO8859_1")) {
-            if (encoding.equals("8859_1")) {
-                enc = "ISO8859_1";
-            /*
-             * On Solaris with nl_langinfo() called in GetJavaProperties():
-             *
-             *   locale undefined -> NULL -> hardcoded default
-             *   "C" locale       -> "" -> hardcoded default    (on 2.6)
-             *   "C" locale       -> "646"                      (on 2.7)
-             *   "en_US" locale -> "ISO8859-1"
-             *   "en_GB" locale -> "ISO8859-1"                  (on 2.7)
-             *   "en_UK" locale -> "ISO8859-1"                  (on 2.6)
-             */
-            } else if (encoding.equals("ISO8859-1")) {
-                enc = "ISO8859_1";
-            } else if (encoding.equals("646")) {
-                enc = "ASCII";
-            } else {
-                enc = CharacterEncoding.aliasName(encoding);
-            }
-        }
-        if (enc == null) {
-            enc = encoding;
-        }
-
-        try {
-            return Class.forName(getConverterPackageName()
-                                 + "." + converterPrefix[type] + enc);
-        } catch(ClassNotFoundException e) {
-            throw new UnsupportedEncodingException(enc);
-        }
-
-    }
-
-    /**
-     * Instantiate the given converter class, or throw an
-     * UnsupportedEncodingException if it cannot be instantiated
-     */
-    private static Object newConverter(String enc, Class<?> c)
-        throws UnsupportedEncodingException
-    {
-        try {
-            return c.newInstance();
-        } catch(InstantiationException e) {
-            throw new UnsupportedEncodingException(enc);
-        } catch(IllegalAccessException e) {
-            throw new UnsupportedEncodingException(enc);
-        }
-    }
-
-    /**
-     * Create a converter object that implements the given type of converter
-     * for the given encoding, or throw an UnsupportedEncodingException if no
-     * appropriate converter class can be found and instantiated
-     */
-    static Object newConverter(int type, String enc)
-        throws UnsupportedEncodingException
-    {
-        Class<?> c;
-        synchronized (lock) {
-            c = cache(type, enc);
-            if (c == null) {
-                c = getConverterClass(type, enc);
-                if (!c.getName().equals("sun.io.CharToByteUTF8"))
-                    cache(type, enc, c);
-            }
-        }
-        return newConverter(enc, c);
-    }
-
-    /**
-     * Find the class that implements the given type of converter for the
-     * default encoding.  If the default encoding cannot be determined or is
-     * not yet defined, return a class that implements the fallback default
-     * encoding, which is just ISO 8859-1.
-     */
-    private static Class<?> getDefaultConverterClass(int type) {
-        boolean fillCache = false;
-        Class<?> c;
-
-        /* First check the class cache */
-        c = cache(type, DEFAULT_NAME);
-        if (c != null)
-            return c;
-
-        /* Determine the encoding name */
-        String enc = getDefaultEncodingName();
-        if (enc != null) {
-            /* file.encoding has been set, so cache the converter class */
-            fillCache = true;
-        } else {
-            /* file.encoding has not been set, so use a default encoding which
-               will not be cached */
-            enc = "ISO8859_1";
-        }
-
-        /* We have an encoding name; try to find its class */
-        try {
-            c = getConverterClass(type, enc);
-            if (fillCache) {
-                cache(type, DEFAULT_NAME, c);
-            }
-        } catch (UnsupportedEncodingException x) {
-            /* Can't find the default class, so fall back to ISO 8859-1 */
-            try {
-                c = getConverterClass(type, "ISO8859_1");
-            } catch (UnsupportedEncodingException y) {
-                throw new InternalError("Cannot find default "
-                                        + converterPrefix[type]
-                                        + " converter class");
-            }
-        }
-        return c;
-
-    }
-
-    /**
-     * Create a converter object that implements the given type of converter
-     * for the default encoding, falling back to ISO 8859-1 if the default
-     * encoding cannot be determined.
-     */
-    static Object newDefaultConverter(int type) {
-        Class<?> c;
-        synchronized (lock) {
-            c = getDefaultConverterClass(type);
-        }
-        try {
-            return newConverter("", c);
-        } catch (UnsupportedEncodingException x) {
-            throw new InternalError("Cannot instantiate default converter"
-                                    + " class " + c.getName());
-        }
-    }
-
-}
diff --git a/src/share/classes/sun/io/MalformedInputException.java b/src/share/classes/sun/io/MalformedInputException.java
deleted file mode 100644
index 8788815..0000000
--- a/src/share/classes/sun/io/MalformedInputException.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-
-/**
-* The input string or input byte array to a character conversion
-* contains a malformed sequence of characters or bytes.
-*
-* @author Asmus Freytag
-*
-* @deprecated Replaced by {@link java.nio.charset}.  THIS API WILL BE
-* REMOVED IN J2SE 1.6.
-*/
-@Deprecated
-public class MalformedInputException
-    extends java.io.CharConversionException
-{
-    private static final long serialVersionUID = 2585413228493157652L;
-
-    /**
-     * Constructs a MalformedInputException with no detail message.
-     * A detail message is a String that describes this particular exception.
-     */
-    public MalformedInputException() {
-        super();
-    }
-
-    /**
-     * Constructs a MalformedInputException with the specified detail message.
-     * A detail message is a String that describes this particular exception.
-     * @param s the String containing a detail message
-     */
-    public MalformedInputException(String s) {
-        super(s);
-    }
-}
diff --git a/src/share/classes/sun/io/UnknownCharacterException.java b/src/share/classes/sun/io/UnknownCharacterException.java
deleted file mode 100644
index efe33b9..0000000
--- a/src/share/classes/sun/io/UnknownCharacterException.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.io;
-
-
-/**
-* A character conversion encountered a character
-* that does not have an assigned mapping, and automatic
-* substitution is not selected
-*
-* @author Asmus Freytag
-* @deprecated Replaced by {@link java.nio.charset}.  THIS API WILL BE
-* REMOVED IN J2SE 1.6.
-*/
-@Deprecated
-public class UnknownCharacterException
-    extends java.io.CharConversionException
-{
-    private static final long serialVersionUID = -8563196502398436986L;
-
-    /**
-     * Constructs a UnknownCharacterException with no detail message.
-     * A detail message is a String that describes this particular exception.
-     */
-    public UnknownCharacterException() {
-        super();
-    }
-
-    /**
-     * Constructs a UnknownCharacterException with the specified detail message.
-     * A detail message is a String that describes this particular exception.
-     * @param s the String containing a detail message
-     */
-    public UnknownCharacterException(String s) {
-        super(s);
-    }
-}
diff --git a/src/share/classes/sun/nio/cs/ext/GB18030.java b/src/share/classes/sun/nio/cs/ext/GB18030.java
index daffbe4..97be5c5 100644
--- a/src/share/classes/sun/nio/cs/ext/GB18030.java
+++ b/src/share/classes/sun/nio/cs/ext/GB18030.java
@@ -47,30 +47,6 @@
         super("GB18030", ExtendedCharsets.aliasesFor("GB18030"));
     }
 
-    public short[] getDecoderIndex1() {
-        return decoderIndex1;
-    }
-
-    public String[] getDecoderIndex2() {
-        return decoderIndex2;
-    }
-
-    public short[] getSubDecoderIndex1() {
-        return index1;
-    }
-
-    public String[] getSubDecoderIndex2() {
-        return index2;
-    }
-
-    public short[] getEncoderIndex1() {
-        return encoderIndex1;
-    }
-
-    public String[] getEncoderIndex2() {
-        return encoderIndex2;
-    }
-
     public boolean contains(Charset cs) {
         return ((cs.name().equals("US-ASCII"))
                 || (cs.name().equals("GBK"))
diff --git a/src/share/classes/sun/nio/cs/ext/IBM33722.java b/src/share/classes/sun/nio/cs/ext/IBM33722.java
index b9063e5..407b1cc 100644
--- a/src/share/classes/sun/nio/cs/ext/IBM33722.java
+++ b/src/share/classes/sun/nio/cs/ext/IBM33722.java
@@ -62,47 +62,6 @@
         return new Encoder(this);
     }
 
-
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-
-    public String getDecoderSingleByteMappings() {
-        return Decoder.byteToCharTable;
-    }
-
-    public String getDecoderMappingTableG1() {
-        return Decoder.mappingTableG1;
-    }
-
-    public String getDecoderMappingTableG2() {
-        return Decoder.mappingTableG2;
-    }
-
-    public String getDecoderMappingTableG3() {
-        return Decoder.mappingTableG3;
-    }
-
-    public short[] getEncoderIndex1() {
-        return Encoder.index1;
-
-    }
-    public String getEncoderIndex2() {
-        return Encoder.index2;
-    }
-
-    public String getEncoderIndex2a() {
-        return Encoder.index2a;
-    }
-
-    public String getEncoderIndex2b() {
-        return Encoder.index2b;
-    }
-
     protected static class Decoder extends CharsetDecoder {
 
         private final int G0 = 0;
diff --git a/src/share/classes/sun/nio/cs/ext/IBM964.java b/src/share/classes/sun/nio/cs/ext/IBM964.java
index 4635f86..ab6eff0 100644
--- a/src/share/classes/sun/nio/cs/ext/IBM964.java
+++ b/src/share/classes/sun/nio/cs/ext/IBM964.java
@@ -62,54 +62,6 @@
         return new Encoder(this);
     }
 
-
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-
-    public String getDecoderSingleByteMappings() {
-        return Decoder.byteToCharTable;
-    }
-
-    public String getDecoderMappingTableG1() {
-        return Decoder.mappingTableG1;
-    }
-
-    public String getDecoderMappingTableG2a2() {
-        return Decoder.mappingTableG2a2;
-    }
-
-    public String getDecoderMappingTableG2ac() {
-        return Decoder.mappingTableG2ac;
-    }
-
-    public String getDecoderMappingTableG2ad() {
-        return Decoder.mappingTableG2ad;
-    }
-
-    public short[] getEncoderIndex1() {
-        return Encoder.index1;
-
-    }
-    public String getEncoderIndex2() {
-        return Encoder.index2;
-
-    }
-    public String getEncoderIndex2a() {
-        return Encoder.index2a;
-    }
-
-    public String getEncoderIndex2b() {
-        return Encoder.index2b;
-    }
-
-    public String getEncoderIndex2c() {
-        return Encoder.index2c;
-    }
     protected static class Decoder extends CharsetDecoder {
         private final int SS2 =  0x8E;
         private final int SS3 =  0x8F;
diff --git a/src/share/classes/sun/nio/cs/ext/ISCII91.java b/src/share/classes/sun/nio/cs/ext/ISCII91.java
index 50c7663..3d360fd 100644
--- a/src/share/classes/sun/nio/cs/ext/ISCII91.java
+++ b/src/share/classes/sun/nio/cs/ext/ISCII91.java
@@ -331,18 +331,6 @@
         '\uffff'  // ff -- This position shall not be used
     }; //end of table definition
 
-    /**
-     * This accessor is temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unnecessary and should be removed
-     */
-
-    public static char[] getDirectMapTable() {
-        return directMapTable;
-    }
-
     private static final byte[] encoderMappingTable = {
     NO_CHAR,NO_CHAR, //0900 <reserved>
     (byte)161,NO_CHAR, //0901 -- DEVANAGARI SIGN CANDRABINDU = anunasika
@@ -474,20 +462,6 @@
     NO_CHAR,NO_CHAR  //097f -- reserved
     }; //end of table definition
 
-
-    /**
-     * This accessor is temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unnecessary and should be removed
-     */
-
-    public static byte[] getEncoderMappingTable() {
-        return encoderMappingTable;
-    }
-
-
     private static class Decoder extends CharsetDecoder {
 
         private static final char ZWNJ_CHAR = '\u200c';
diff --git a/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java b/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java
index 552ca60..ae70911 100644
--- a/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java
+++ b/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java
@@ -1000,18 +1000,11 @@
         return REPLACE_CHAR;
     }
 
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-    public static short[] getIndex1() {
+    static short[] getIndex1() {
        return index1;
     }
 
-    public static String[] getIndex2() {
+    static String[] getIndex2() {
        return index2;
     }
 }
diff --git a/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java b/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java
index 1cfd1df..e4407a5 100644
--- a/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java
+++ b/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java
@@ -65,19 +65,11 @@
         return -1;
     }
 
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-
-    public static short[] getIndex1() {
+    static short[] getIndex1() {
        return index1;
     }
 
-    public static String[] getIndex2() {
+    static String[] getIndex2() {
        return index2;
     }
 
diff --git a/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Decoder.java b/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Decoder.java
index 390d7e3..65a51c5 100644
--- a/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Decoder.java
+++ b/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Decoder.java
@@ -201,19 +201,11 @@
     }
 
 
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-
-    public static short[] getIndex1() {
+    static short[] getIndex1() {
        return index1;
     }
 
-    public static String[] getIndex2() {
+    static String[] getIndex2() {
        return index2;
     }
 }
diff --git a/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Decoder.java b/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Decoder.java
index 7434ac7..4838ffc 100644
--- a/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Decoder.java
+++ b/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Decoder.java
@@ -42,21 +42,6 @@
               0x7E);
     }
 
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-
-    public static short[] getIndex1() {
-        return index1;
-    }
-    public static String[] getIndex2() {
-        return index2;
-    }
-
     private final static String innerIndex0=
         "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+
         "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+
diff --git a/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Encoder.java b/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Encoder.java
index 4551859..fd9c826 100644
--- a/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Encoder.java
+++ b/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Encoder.java
@@ -58,20 +58,6 @@
         return -1;
     }
 
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-    public static short[] getIndex1() {
-        return index1;
-    }
-    public static String[] getIndex2() {
-        return index2;
-    }
-
     private final static String innerIndex0=
         "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
         "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
diff --git a/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Decoder.java b/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Decoder.java
index 0ffd4a5..21bf704 100644
--- a/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Decoder.java
+++ b/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Decoder.java
@@ -41,21 +41,6 @@
               0x7E);
     }
 
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-
-    public static short[] getIndex1() {
-        return index1;
-    }
-    public static String[] getIndex2() {
-        return index2;
-    }
-
     private final static String innerIndex0=
         "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+
         "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+
diff --git a/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java b/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java
index 26cb5d3..2bd596b 100644
--- a/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java
+++ b/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java
@@ -48,21 +48,6 @@
         return -1;
     }
 
-    /**
-     * These accessors are temporarily supplied while sun.io
-     * converters co-exist with the sun.nio.cs.{ext} charset coders
-     * These facilitate sharing of conversion tables between the
-     * two co-existing implementations. When sun.io converters
-     * are made extinct these will be unncessary and should be removed
-     */
-
-    public static short[] getIndex1() {
-        return index1;
-    }
-    public static String[] getIndex2() {
-        return index2;
-    }
-
     private final static String innerIndex0=
         "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
         "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
diff --git a/test/sun/nio/cs/TestCp834_SBCS.java b/test/sun/nio/cs/TestCp834_SBCS.java
index 9ca5e26..25e6469 100644
--- a/test/sun/nio/cs/TestCp834_SBCS.java
+++ b/test/sun/nio/cs/TestCp834_SBCS.java
@@ -26,7 +26,6 @@
    @summary Check all Cp933 SBCS characters are not supported in Cp834
  */
 
-import sun.io.*;
 import java.io.*;
 import java.nio.*;
 import java.nio.charset.*;
@@ -36,8 +35,6 @@
         // The correctness of 1:1 mapping is Coverted by CoderTest.java
         // and TestConv.java, we only need to verify that SBCS characters
         // are not supported by this charset.
-        CharToByteConverter cb834 = CharToByteConverter.getConverter("Cp834");
-        ByteToCharConverter bc834 = ByteToCharConverter.getConverter("Cp834");
         CharsetEncoder enc834 = Charset.forName("Cp834")
                                        .newEncoder()
                                        .onUnmappableCharacter(CodingErrorAction.REPLACE)
@@ -73,27 +70,6 @@
                     ByteBuffer bb = enc834.encode(CharBuffer.wrap(ca));
                     if (bb.get() != (byte)0xfe || bb.get() != (byte)0xfe)
                         throw new Exception("SBCS is supported in IBM834 encoder");
-
-                    boolean isMalformed = false;
-                    int ret = 0;
-                    bc834.reset();
-                    try {
-                        ret = bc834.convert(ba, 0, 1, ca, 0, 1);
-                    } catch (sun.io.MalformedInputException x) { isMalformed = true; }
-                    if (!isMalformed && ret != 0 && ca[0] != '\ufffd') {
-                        // three scenarios (1)malformed (2)held as an incomplete
-                        // input or (3)return replacement all mean "no sbcs"
-                        throw new Exception("SBCS is supported in Cp834 b2c");
-                    }
-
-                    if (cb834.canConvert(c))
-                        throw new Exception("SBCS can be converted in Cp834 c2b ");
-
-                    ca[0] = c;
-                    if (cb834.convert(ca, 0, 1, ba2, 0, 2) != 2 ||
-                        ba2[0] != (byte)0xfe || ba2[1] != (byte)0xfe) {
-                        throw new Exception("SBCS is supported in Cp834 c2b");
-                    }
                 }
             }
         }
diff --git a/test/sun/nio/cs/TestISCII91.java b/test/sun/nio/cs/TestISCII91.java
deleted file mode 100644
index e043862..0000000
--- a/test/sun/nio/cs/TestISCII91.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
-   @bug 6431650
-   @summary Check charset ISCII91 and C2B/B2CISCII91 yield same encoding/decoding result
- */
-
-
-import java.nio.*;
-import java.nio.charset.*;
-import sun.io.*;
-
-public class TestISCII91 {
-    public static void main(String[] args) throws Throwable{
-        CharToByteConverter c2b = new CharToByteISCII91();
-        ByteToCharConverter b2c = new ByteToCharISCII91();
-        Charset cs = Charset.forName("ISCII91");
-        String charsToEncode = getCharsForEncoding("ISCII91");
-
-        byte [] c2bBytes = c2b.convertAll(charsToEncode.toCharArray());
-        byte [] csBytes = cs.encode(charsToEncode).array();
-        for (int i = 0; i < c2bBytes.length; ++i) {
-            if (c2bBytes[i] != csBytes[i])
-                throw new RuntimeException("ISCII91 encoding failed!");
-        }
-
-        char[] c2bChars = b2c.convertAll(c2bBytes);
-        char[] csChars = cs.decode(ByteBuffer.wrap(csBytes)).array();
-        for (int i = 0; i < c2bChars.length; ++i) {
-            if (c2bChars[i] != csChars[i])
-                throw new RuntimeException("ISCII91 decoding failed!");
-        }
-    }
-
-
-    static String getCharsForEncoding(String encodingName)
-        throws CharacterCodingException{
-        Charset set = Charset.forName(encodingName);
-        CharBuffer chars = CharBuffer.allocate(300);
-        CharsetEncoder encoder = set.newEncoder();
-        for (int c = 0; chars.remaining() > 0 && c < Character.MAX_VALUE; ++c) {
-            if (Character.isDefined((char) c) && !Character.isISOControl((char) c) && encoder.canEncode((char) c)) {
-                chars.put((char) c);
-            }
-        }
-        chars.limit(chars.position());
-        chars.rewind();
-        return chars.toString();
-    }
-}