--- a/jdk/src/share/classes/sun/io/ByteToCharCp970.java	Wed May 20 13:55:50 2009 -0700
+++ b/jdk/src/share/classes/sun/io/ByteToCharCp970.java	Thu May 21 23:32:46 2009 -0700
@@ -24,30 +24,16 @@
  */
 package sun.io;
 
-import sun.nio.cs.ext.IBM970;
+import sun.nio.cs.ext.*;
 
-/**
-* A table to convert Cp970 to Unicode
-*
-* @author Malcolm Ayres, assisted by UniMap program
-*/
-public class ByteToCharCp970
-        extends ByteToCharEUC
-
-{
-        private final static IBM970 nioCoder = new IBM970();
+public class ByteToCharCp970 extends ByteToCharEUC2 {
 
-        // Return the character set id
-        public String getCharacterEncoding()
-        {
-                return "Cp970";
-        }
+    // Return the character set id
+    public String getCharacterEncoding() {
+        return "Cp970";
+    }
 
-        public ByteToCharCp970()
-        {
-            // Set the correct mapping table
-            super();
-            super.byteToCharTable = nioCoder.getDecoderSingleByteMappings();
-            super.mappingTableG1 = nioCoder.getDecoderMappingTableG1();
-        }
+    public ByteToCharCp970() {
+        super((DoubleByte.Decoder)new IBM970().newDecoder());
+    }
 }