remove old DUMMY mechanics

jruby · Dec 15, 2015 · d241887 · d241887
1 parent 28d102e
commit d241887
Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/src/org/jcodings/Encoding.java b/src/org/jcodings/Encoding.java
@@ -541,7 +541,7 @@ public final boolean isFixedWidth() {
 
     public static final byte NEW_LINE = (byte)0x0a;
 
-    static Encoding loadDummyOrEncoding(String name, boolean dummy) {
+    public static Encoding load(String name) {
         String encClassName = "org.jcodings.specific." + name + "Encoding";
         Class<?> encClass;
         try {
@@ -550,14 +550,6 @@ static Encoding loadDummyOrEncoding(String name, boolean dummy) {
             throw new InternalException(ErrorMessages.ERR_ENCODING_CLASS_DEF_NOT_FOUND, encClassName);
         }
 
-        if (dummy) {
-            try {
-                return (Encoding) encClass.getField("DUMMY").get(encClass);
-            } catch (Exception e) {
-                // try to fall back on normal instance
-            }
-        }
-
         try {
             return (Encoding)encClass.getField("INSTANCE").get(encClass);
         } catch (Exception e2) {

diff --git a/src/org/jcodings/EncodingDB.java b/src/org/jcodings/EncodingDB.java
@@ -75,9 +75,9 @@ public Entry getBase() {
         public Encoding getEncoding() {
             if (encoding == null) {
                 if (name == null) {
-                    encoding = Encoding.loadDummyOrEncoding(encodingClass, false);
+                    encoding = Encoding.load(encodingClass);
                 } else {
-                    encoding = Encoding.loadDummyOrEncoding(encodingClass, isDummy).replicate(name);
+                    encoding = Encoding.load(encodingClass).replicate(name);
                     if (isDummy) encoding.setDummy();
                 }
             }

diff --git a/src/org/jcodings/specific/ASCIIEncoding.java b/src/org/jcodings/specific/ASCIIEncoding.java
@@ -45,10 +45,4 @@ public boolean isCodeCType(int code, int ctype) {
     }
 
     public static final ASCIIEncoding INSTANCE = new ASCIIEncoding();
-    public static final ASCIIEncoding DUMMY;
-    static {
-        DUMMY = new ASCIIEncoding();
-        DUMMY.setName("DUMMY");
-        DUMMY.setDummy();
-    }
 }