--- old/src/share/classes/sun/io/CharToByteCp942C.java	Wed May 20 18:59:09 2009
+++ new/src/share/classes/sun/io/CharToByteCp942C.java	Wed May 20 18:59:08 2009
@@ -25,47 +25,16 @@
 
 package sun.io;
 
-import sun.io.*;
+import sun.nio.cs.ext.*;
 
 public class CharToByteCp942C extends CharToByteDBCS_ASCII {
-   protected static final int mask1;
-   protected static final int mask2;
-   protected static final int shift;
-   protected static final short index1[];
-   protected static final String index2;
-   protected static final String index2a;
 
-   static {
-      CharToByteDBCS_ASCII y = new CharToByteCp942();
-      mask1 = y.mask1;
-      mask2 = y.mask2;
-      shift = y.shift;
-      index2 = y.index2;
+    // Return the character set id
+    public String getCharacterEncoding() {
+        return "Cp942C";
+    }
 
-      /* Fix converter to pass through U+0000 to U+007F unchanged to 0x00 to 0x7f */
-      String indexs = "";
-      for (char c = '\0'; c < '\u0080'; ++c) indexs += c;
-      index2a = y.index2a + indexs;
-
-      int o = y.index2a.length() + 15000;
-      index1 = new short[y.index1.length];
-      System.arraycopy(y.index1, 0, index1, 0, y.index1.length);
-      for (int i = 0; i * (1<<shift) < 128; ++i) {
-         index1[i] = (short)(o + i * (1<<shift));
-      }
-   }
-
-   public String getCharacterEncoding() {
-      return "Cp942C";
-   }
-
-   CharToByteCp942C() {
-      super();
-      super.mask1 = mask1;
-      super.mask2 = mask2;
-      super.shift = shift;
-      super.index1 = index1;
-      super.index2 = index2;
-      super.index2a = index2a;
-   }
+    public CharToByteCp942C() {
+        super((DoubleByte.Encoder)new IBM942C().newEncoder());
+    }
 }