Removed unused methods

12 files changed, 7 insertions, 193 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java b/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java
index c89f7e3..83033bc 100644
--- a/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java
@@ -33,7 +33,7 @@ public class ArgumentEntry implements Entry, Serializable {
             throw new IllegalArgumentException("Argument name cannot be null!");
         }
 
-        m_behaviorEntry = behaviorEntry;
+       m_behaviorEntry = behaviorEntry;
         m_index = index;
         m_name = name;
     }
@@ -101,9 +101,7 @@ public class ArgumentEntry implements Entry, Serializable {
     }
 
     public boolean equals(ArgumentEntry other) {
-        return m_behaviorEntry.equals(other.m_behaviorEntry)
-                && m_index == other.m_index
-                && m_name.equals(other.m_name);
+        return m_behaviorEntry.equals(other.m_behaviorEntry) && m_index == other.m_index && m_name.equals(other.m_name);
     }
 
     @Override
diff --git a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
index 99e463d..f831a3b 100644
--- a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
@@ -117,15 +117,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return classMapping;
     }
 
-    public String getDeobfInnerClassName(String obfSimpleName) {
-        assert (isSimpleClassName(obfSimpleName));
-        ClassMapping classMapping = m_innerClassesByObfSimple.get(obfSimpleName);
-        if (classMapping != null) {
-            return classMapping.getDeobfName();
-        }
-        return null;
-    }
-
     public void setInnerClassName(ClassEntry obfInnerClass, String deobfName) {
         ClassMapping classMapping = getOrCreateInnerClass(obfInnerClass);
         if (classMapping.getDeobfName() != null) {
@@ -156,10 +147,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return m_fieldsByObf.values();
     }
 
-    public boolean containsObfField(String obfName, Type obfType) {
-        return m_fieldsByObf.containsKey(getFieldKey(obfName, obfType));
-    }
-
     public boolean containsDeobfField(String deobfName, Type deobfType) {
         return m_fieldsByDeobf.containsKey(getFieldKey(deobfName, deobfType));
     }
@@ -193,10 +180,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return m_fieldsByObf.get(getFieldKey(obfName, obfType));
     }
 
-    public FieldMapping getFieldByDeobf(String deobfName, Type obfType) {
-        return m_fieldsByDeobf.get(getFieldKey(deobfName, obfType));
-    }
-
     public String getObfFieldName(String deobfName, Type obfType) {
         FieldMapping fieldMapping = m_fieldsByDeobf.get(getFieldKey(deobfName, obfType));
         if (fieldMapping != null) {
@@ -260,10 +243,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return m_methodsByObf.values();
     }
 
-    public boolean containsObfMethod(String obfName, Signature obfSignature) {
-        return m_methodsByObf.containsKey(getMethodKey(obfName, obfSignature));
-    }
-
     public boolean containsDeobfMethod(String deobfName, Signature obfSignature) {
         return m_methodsByDeobf.containsKey(getMethodKey(deobfName, obfSignature));
     }
@@ -400,48 +379,6 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         return m_obfFullName.compareTo(other.m_obfFullName);
     }
 
-    public boolean renameObfClass(String oldObfClassName, String newObfClassName) {
-
-        // rename inner classes
-        for (ClassMapping innerClassMapping : new ArrayList<>(m_innerClassesByObfSimple.values())) {
-            if (innerClassMapping.renameObfClass(oldObfClassName, newObfClassName)) {
-                boolean wasRemoved = m_innerClassesByObfSimple.remove(oldObfClassName) != null;
-                assert (wasRemoved);
-                boolean wasAdded = m_innerClassesByObfSimple.put(newObfClassName, innerClassMapping) == null;
-                assert (wasAdded);
-            }
-        }
-
-        // rename field types
-        for (FieldMapping fieldMapping : new ArrayList<>(m_fieldsByObf.values())) {
-            String oldFieldKey = getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType());
-            if (fieldMapping.renameObfClass(oldObfClassName, newObfClassName)) {
-                boolean wasRemoved = m_fieldsByObf.remove(oldFieldKey) != null;
-                assert (wasRemoved);
-                boolean wasAdded = m_fieldsByObf.put(getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType()), fieldMapping) == null;
-                assert (wasAdded);
-            }
-        }
-
-        // rename method signatures
-        for (MethodMapping methodMapping : new ArrayList<>(m_methodsByObf.values())) {
-            String oldMethodKey = getMethodKey(methodMapping.getObfName(), methodMapping.getObfSignature());
-            if (methodMapping.renameObfClass(oldObfClassName, newObfClassName)) {
-                boolean wasRemoved = m_methodsByObf.remove(oldMethodKey) != null;
-                assert (wasRemoved);
-                boolean wasAdded = m_methodsByObf.put(getMethodKey(methodMapping.getObfName(), methodMapping.getObfSignature()), methodMapping) == null;
-                assert (wasAdded);
-            }
-        }
-
-        if (m_obfFullName.equals(oldObfClassName)) {
-            // rename this class
-            m_obfFullName = newObfClassName;
-            return true;
-        }
-        return false;
-    }
-
     public boolean containsArgument(BehaviorEntry obfBehaviorEntry, String name) {
         MethodMapping methodMapping = m_methodsByObf.get(getMethodKey(obfBehaviorEntry.getName(), obfBehaviorEntry.getSignature()));
         return methodMapping != null && methodMapping.containsArgument(name);
diff --git a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java b/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
index bd6ce4e..0ac739c 100644
--- a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
+++ b/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
@@ -33,10 +33,6 @@ public class EntryFactory {
         return new ClassEntry(classMapping.getObfFullName());
     }
 
-    public static ClassEntry getDeobfClassEntry(ClassMapping classMapping) {
-        return new ClassEntry(classMapping.getDeobfName());
-    }
-
     public static ClassEntry getSuperclassEntry(CtClass c) {
         return new ClassEntry(Descriptor.toJvmName(c.getClassFile().getSuperclass()));
     }
@@ -155,8 +151,4 @@ public class EntryFactory {
     public static BehaviorEntry getObfBehaviorEntry(ClassEntry classEntry, MethodMapping methodMapping) {
         return getBehaviorEntry(classEntry, methodMapping.getObfName(), methodMapping.getObfSignature());
     }
-
-    public static BehaviorEntry getObfBehaviorEntry(ClassMapping classMapping, MethodMapping methodMapping) {
-        return getObfBehaviorEntry(getObfClassEntry(classMapping), methodMapping);
-    }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/EntryPair.java b/src/main/java/cuchaz/enigma/mapping/EntryPair.java
deleted file mode 100644
index 1c93d53..0000000
--- a/src/main/java/cuchaz/enigma/mapping/EntryPair.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-package cuchaz.enigma.mapping;
-
-public class EntryPair<T extends Entry> {
-
-    public T obf;
-    public T deobf;
-
-    public EntryPair(T obf, T deobf) {
-        this.obf = obf;
-        this.deobf = deobf;
-    }
-}
diff --git a/src/main/java/cuchaz/enigma/mapping/Mappings.java b/src/main/java/cuchaz/enigma/mapping/Mappings.java
index a48ec3f..ee4c302 100644
--- a/src/main/java/cuchaz/enigma/mapping/Mappings.java
+++ b/src/main/java/cuchaz/enigma/mapping/Mappings.java
@@ -79,10 +79,6 @@ public class Mappings implements Serializable {
         return m_classesByObf.get(obfName);
     }
 
-    public ClassMapping getClassByDeobf(ClassEntry entry) {
-        return getClassByDeobf(entry.getName());
-    }
-
     public ClassMapping getClassByDeobf(String deobfName) {
         return m_classesByDeobf.get(deobfName);
     }
@@ -138,34 +134,6 @@ public class Mappings implements Serializable {
         return buf.toString();
     }
 
-    public void renameObfClass(String oldObfName, String newObfName) {
-        new ArrayList<>(classes()).stream().filter(classMapping -> classMapping.renameObfClass(oldObfName, newObfName)).forEach(classMapping -> {
-            boolean wasRemoved = m_classesByObf.remove(oldObfName) != null;
-            assert (wasRemoved);
-            boolean wasAdded = m_classesByObf.put(newObfName, classMapping) == null;
-            assert (wasAdded);
-        });
-    }
-
-    public Set<String> getAllObfClassNames() {
-        final Set<String> classNames = Sets.newHashSet();
-        for (ClassMapping classMapping : classes()) {
-
-            // add the class name
-            classNames.add(classMapping.getObfFullName());
-
-            // add classes from method signatures
-            for (MethodMapping methodMapping : classMapping.methods()) {
-                for (Type type : methodMapping.getObfSignature().types()) {
-                    if (type.hasClass()) {
-                        classNames.add(type.getClassEntry().getClassName());
-                    }
-                }
-            }
-        }
-        return classNames;
-    }
-
     public boolean containsDeobfClass(String deobfName) {
         return m_classesByDeobf.containsKey(deobfName);
     }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java b/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
index a23a33f..ed36d42 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
@@ -56,7 +56,7 @@ public class MappingsReaderOld {
                     ClassMapping classMapping;
                     if (indent <= 0) {
                         // outer class
-                        classMapping = readClass(parts, false);
+                        classMapping = readClass(parts);
                         mappings.addClassMapping(classMapping);
                     } else {
 
@@ -65,7 +65,7 @@ public class MappingsReaderOld {
                             throw new MappingParseException(lineNumber, "Unexpected CLASS entry here!");
                         }
 
-                        classMapping = readClass(parts, true);
+                        classMapping = readClass(parts);
                         ((ClassMapping) mappingStack.peek()).addInnerClassMapping(classMapping);
                     }
                     mappingStack.push(classMapping);
@@ -99,7 +99,7 @@ public class MappingsReaderOld {
         return new ArgumentMapping(Integer.parseInt(parts[1]), parts[2]);
     }
 
-    private ClassMapping readClass(String[] parts, boolean makeSimple) {
+    private ClassMapping readClass(String[] parts) {
         if (parts.length == 2) {
             return new ClassMapping(parts[1]);
         } else {
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
index 2b112a2..3050da6 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -167,34 +167,6 @@ public class MappingsRenamer {
         classMapping.setArgumentName(obf.getMethodName(), obf.getMethodSignature(), obf.getIndex(), obf.getName());
     }
 
-    public boolean moveFieldToObfClass(ClassMapping classMapping, FieldMapping fieldMapping, ClassEntry obfClass) {
-        classMapping.removeFieldMapping(fieldMapping);
-        ClassMapping targetClassMapping = getOrCreateClassMapping(obfClass);
-        if (!targetClassMapping.containsObfField(fieldMapping.getObfName(), fieldMapping.getObfType())) {
-            if (!targetClassMapping.containsDeobfField(fieldMapping.getDeobfName(), fieldMapping.getObfType())) {
-                targetClassMapping.addFieldMapping(fieldMapping);
-                return true;
-            } else {
-                System.err.println("WARNING: deobf field was already there: " + obfClass + "." + fieldMapping.getDeobfName());
-            }
-        }
-        return false;
-    }
-
-    public boolean moveMethodToObfClass(ClassMapping classMapping, MethodMapping methodMapping, ClassEntry obfClass) {
-        classMapping.removeMethodMapping(methodMapping);
-        ClassMapping targetClassMapping = getOrCreateClassMapping(obfClass);
-        if (!targetClassMapping.containsObfMethod(methodMapping.getObfName(), methodMapping.getObfSignature())) {
-            if (!targetClassMapping.containsDeobfMethod(methodMapping.getDeobfName(), methodMapping.getObfSignature())) {
-                targetClassMapping.addMethodMapping(methodMapping);
-                return true;
-            } else {
-                System.err.println("WARNING: deobf method was already there: " + obfClass + "." + methodMapping.getDeobfName() + methodMapping.getObfSignature());
-            }
-        }
-        return false;
-    }
-
     public void write(OutputStream out) throws IOException {
         // TEMP: just use the object output for now. We can find a more efficient storage format later
         GZIPOutputStream gzipout = new GZIPOutputStream(out);
diff --git a/src/main/java/cuchaz/enigma/mapping/MethodEntry.java b/src/main/java/cuchaz/enigma/mapping/MethodEntry.java
index 01a5c43..7df4dd8 100644
--- a/src/main/java/cuchaz/enigma/mapping/MethodEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/MethodEntry.java
@@ -89,9 +89,7 @@ public class MethodEntry implements BehaviorEntry, Serializable {
     }
 
     public boolean equals(MethodEntry other) {
-        return m_classEntry.equals(other.m_classEntry)
-                && m_name.equals(other.m_name)
-                && m_signature.equals(other.m_signature);
+        return m_classEntry.equals(other.m_classEntry) && m_name.equals(other.m_name) && m_signature.equals(other.m_signature);
     }
 
     @Override
diff --git a/src/main/java/cuchaz/enigma/mapping/NameValidator.java b/src/main/java/cuchaz/enigma/mapping/NameValidator.java
index a3b9a78..f416322 100644
--- a/src/main/java/cuchaz/enigma/mapping/NameValidator.java
+++ b/src/main/java/cuchaz/enigma/mapping/NameValidator.java
@@ -31,17 +31,6 @@ public class NameValidator {
     static {
 
         // java allows all kinds of weird characters...
-        StringBuilder startChars = new StringBuilder();
-        StringBuilder partChars = new StringBuilder();
-        for (int i = Character.MIN_CODE_POINT; i <= Character.MAX_CODE_POINT; i++) {
-            if (Character.isJavaIdentifierStart(i)) {
-                startChars.appendCodePoint(i);
-            }
-            if (Character.isJavaIdentifierPart(i)) {
-                partChars.appendCodePoint(i);
-            }
-        }
-
         String identifierRegex = "[A-Za-z_<][A-Za-z0-9_>]*";
         IdentifierPattern = Pattern.compile(identifierRegex);
         ClassPattern = Pattern.compile(String.format("^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex));
diff --git a/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java b/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java
index 9864333..ec300fe 100644
--- a/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java
+++ b/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java
@@ -79,13 +79,4 @@ public class SignatureUpdater {
 
         return null;
     }
-
-    public static List<String> getClasses(String signature) {
-        final List<String> classNames = Lists.newArrayList();
-        update(signature, className -> {
-            classNames.add(className);
-            return className;
-        });
-        return classNames;
-    }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/Translator.java b/src/main/java/cuchaz/enigma/mapping/Translator.java
index 1947d1c..b0107ce 100644
--- a/src/main/java/cuchaz/enigma/mapping/Translator.java
+++ b/src/main/java/cuchaz/enigma/mapping/Translator.java
@@ -38,14 +38,6 @@ public class Translator {
         m_index = index;
     }
 
-    public TranslationDirection getDirection() {
-        return m_direction;
-    }
-
-    public TranslationIndex getTranslationIndex() {
-        return m_index;
-    }
-
     @SuppressWarnings("unchecked")
     public <T extends Entry> T translateEntry(T entry) {
         if (entry instanceof ClassEntry) {
diff --git a/src/main/java/cuchaz/enigma/mapping/Type.java b/src/main/java/cuchaz/enigma/mapping/Type.java
index f2fd34d..ec15941 100644
--- a/src/main/java/cuchaz/enigma/mapping/Type.java
+++ b/src/main/java/cuchaz/enigma/mapping/Type.java
@@ -218,8 +218,7 @@ public class Type implements Serializable {
 
     private static int countArrayDimension(String in) {
         int i = 0;
-        for (; i < in.length() && in.charAt(i) == '['; i++) {
-        }
+        for (; i < in.length() && in.charAt(i) == '['; i++) {}
         return i;
     }