--- a/jdk/src/share/classes/sun/io/ByteToCharCp930.java	Wed May 20 13:55:50 2009 -0700
+++ b/jdk/src/share/classes/sun/io/ByteToCharCp930.java	Thu May 21 23:32:46 2009 -0700
@@ -24,32 +24,16 @@
  */
 package sun.io;
 
-import sun.nio.cs.ext.IBM930;
+import sun.nio.cs.ext.*;
 
-/**
-* Tables and data to convert Cp930 to Unicode.
-*
-* @author Malcolm Ayres, assisted by UniMap program
-*/
-public class ByteToCharCp930
-        extends ByteToCharDBCS_EBCDIC
-
-{
-        private static IBM930 nioCoder = new IBM930();
-        // Return the character set id
+public class ByteToCharCp930 extends ByteToCharDBCS_EBCDIC {
 
-        public String getCharacterEncoding()
-        {
-                return "Cp930";
-        }
+    // Return the character set id
+    public String getCharacterEncoding() {
+        return "Cp930";
+    }
 
-        public ByteToCharCp930() {
-                super();
-                super.mask1 = 0xFFC0;
-                super.mask2 = 0x003F;
-                super.shift = 6;
-                super.singleByteToChar = nioCoder.getDecoderSingleByteMappings();
-                super.index1 = nioCoder.getDecoderIndex1();
-                super.index2 = nioCoder.getDecoderIndex2();
-        }
+    public ByteToCharCp930() {
+        super((DoubleByte.Decoder)new IBM930().newDecoder());
+    }
 }