13 files changed, 52 insertions, 88 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java b/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java
index 886e7be..c89f7e3 100644
--- a/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/ArgumentEntry.java
@@ -97,10 +97,7 @@ public class ArgumentEntry implements Entry, Serializable {
 
     @Override
     public boolean equals(Object other) {
-        if (other instanceof ArgumentEntry) {
-            return equals((ArgumentEntry) other);
-        }
-        return false;
+        return other instanceof ArgumentEntry && equals((ArgumentEntry) other);
     }
 
     public boolean equals(ArgumentEntry other) {
diff --git a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
index 84fb6dd..99e463d 100644
--- a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
@@ -444,10 +444,7 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
 
     public boolean containsArgument(BehaviorEntry obfBehaviorEntry, String name) {
         MethodMapping methodMapping = m_methodsByObf.get(getMethodKey(obfBehaviorEntry.getName(), obfBehaviorEntry.getSignature()));
-        if (methodMapping != null) {
-            return methodMapping.containsArgument(name);
-        }
-        return false;
+        return methodMapping != null && methodMapping.containsArgument(name);
     }
 
     public static boolean isSimpleClassName(String name) {
diff --git a/src/main/java/cuchaz/enigma/mapping/ConstructorEntry.java b/src/main/java/cuchaz/enigma/mapping/ConstructorEntry.java
index 907bd4c..ac1a7f2 100644
--- a/src/main/java/cuchaz/enigma/mapping/ConstructorEntry.java
+++ b/src/main/java/cuchaz/enigma/mapping/ConstructorEntry.java
@@ -87,10 +87,7 @@ public class ConstructorEntry implements BehaviorEntry, Serializable {
 
     @Override
     public boolean equals(Object other) {
-        if (other instanceof ConstructorEntry) {
-            return equals((ConstructorEntry) other);
-        }
-        return false;
+        return other instanceof ConstructorEntry && equals((ConstructorEntry) other);
     }
 
     public boolean equals(ConstructorEntry other) {
diff --git a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
index 3f5a382..19d68a9 100644
--- a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
@@ -16,67 +16,64 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping>, Mem
 
     private static final long serialVersionUID = 8610742471440861315L;
 
-    private String m_obfName;
-    private String m_deobfName;
-    private Type m_obfType;
+    private String obfName;
+    private String deobfName;
+    private Type obfType;
 
     public FieldMapping(String obfName, Type obfType, String deobfName) {
-        m_obfName = obfName;
-        m_deobfName = NameValidator.validateFieldName(deobfName);
-        m_obfType = obfType;
+        this.obfName = obfName;
+        this.deobfName = NameValidator.validateFieldName(deobfName);
+        this.obfType = obfType;
     }
 
     public FieldMapping(FieldMapping other, ClassNameReplacer obfClassNameReplacer) {
-        m_obfName = other.m_obfName;
-        m_deobfName = other.m_deobfName;
-        m_obfType = new Type(other.m_obfType, obfClassNameReplacer);
+        this.obfName = other.obfName;
+        this.deobfName = other.deobfName;
+        this.obfType = new Type(other.obfType, obfClassNameReplacer);
     }
 
     @Override
     public String getObfName() {
-        return m_obfName;
+        return this.obfName;
     }
 
     public void setObfName(String val) {
-        m_obfName = NameValidator.validateFieldName(val);
+        this.obfName = NameValidator.validateFieldName(val);
     }
 
     public String getDeobfName() {
-        return m_deobfName;
+        return this.deobfName;
     }
 
     public void setDeobfName(String val) {
-        m_deobfName = NameValidator.validateFieldName(val);
+        this.deobfName = NameValidator.validateFieldName(val);
     }
 
     public Type getObfType() {
-        return m_obfType;
+        return this.obfType;
     }
 
     public void setObfType(Type val) {
-        m_obfType = val;
+        this.obfType = val;
     }
 
     @Override
     public int compareTo(FieldMapping other) {
-        return (m_obfName + m_obfType).compareTo(other.m_obfName + other.m_obfType);
+        return (this.obfName + this.obfType).compareTo(other.obfName + other.obfType);
     }
 
     public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) {
 
         // rename obf classes in the type
-        Type newType = new Type(m_obfType, new ClassNameReplacer() {
-            @Override
-            public String replace(String className) {
-                if (className.equals(oldObfClassName)) {
-                    return newObfClassName;
-                }
-                return null;
+        Type newType = new Type(this.obfType, className -> {
+            if (className.equals(oldObfClassName)) {
+                return newObfClassName;
             }
+            return null;
         });
 
-        if (!newType.equals(m_obfType)) {
-            m_obfType = newType;
+        if (!newType.equals(this.obfType)) {
+            this.obfType = newType;
             return true;
         }
         return false;
@@ -84,6 +81,6 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping>, Mem
 
     @Override
     public FieldEntry getObfEntry(ClassEntry classEntry) {
-        return new FieldEntry(classEntry, m_obfName, new Type(m_obfType));
+        return new FieldEntry(classEntry, this.obfName, new Type(this.obfType));
     }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
index 5e2b40b..d850787 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
@@ -16,13 +16,11 @@ import com.google.common.collect.Maps;
 import java.util.Map;
 
 import cuchaz.enigma.analysis.JarIndex;
-import cuchaz.enigma.analysis.RelatedMethodChecker;
 
 
 public class MappingsChecker {
 
     private JarIndex m_index;
-    private RelatedMethodChecker m_relatedMethodChecker;
     private Map<ClassEntry, ClassMapping> m_droppedClassMappings;
     private Map<ClassEntry, ClassMapping> m_droppedInnerClassMappings;
     private Map<FieldEntry, FieldMapping> m_droppedFieldMappings;
@@ -30,17 +28,12 @@ public class MappingsChecker {
 
     public MappingsChecker(JarIndex index) {
         m_index = index;
-        m_relatedMethodChecker = new RelatedMethodChecker(m_index);
         m_droppedClassMappings = Maps.newHashMap();
         m_droppedInnerClassMappings = Maps.newHashMap();
         m_droppedFieldMappings = Maps.newHashMap();
         m_droppedMethodMappings = Maps.newHashMap();
     }
 
-    public RelatedMethodChecker getRelatedMethodChecker() {
-        return m_relatedMethodChecker;
-    }
-
     public Map<ClassEntry, ClassMapping> getDroppedClassMappings() {
         return m_droppedClassMappings;
     }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
index b2c3a5c..d1edb9b 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
@@ -31,19 +31,21 @@ public class MappingsReader {
     public void readDirectory(Mappings mappings, File in) throws IOException, MappingParseException {
 
         File[] fList = in.listFiles();
-        for (File file : fList) {
-            if (file.isFile()) {
-                readFile(mappings, new BufferedReader(new FileReader(file)));
-            } else if (file.isDirectory()) {
-                readDirectory(mappings, file.getAbsoluteFile());
+        if (fList != null) {
+            for (File file : fList) {
+                if (file.isFile()) {
+                    readFile(mappings, new BufferedReader(new FileReader(file)));
+                } else if (file.isDirectory()) {
+                    readDirectory(mappings, file.getAbsoluteFile());
+                }
             }
         }
     }
 
     public void readFile(Mappings mappings, BufferedReader in) throws IOException, MappingParseException {
 
-        StringBuffer buf = new StringBuffer();
-        String line = null;
+        StringBuilder buf = new StringBuilder();
+        String line;
         while ((line = in.readLine()) != null) {
             buf.append(line);
         }
@@ -63,10 +65,10 @@ public class MappingsReader {
         jsonClass.getField().forEach(jsonField -> classMapping.addFieldMapping(readField(jsonField.getObf(), jsonField.getName(), jsonField.getType())));
 
         jsonClass.getConstructors().forEach(jsonConstructor -> {
-           MethodMapping methodMapping = readMethod(jsonConstructor.isStatics() ? "<clinit>" : "<init>", null, jsonConstructor.getSignature());
-                     jsonConstructor.getArgs().forEach(jsonArgument -> methodMapping.addArgumentMapping(readArgument(jsonArgument.getIndex(), jsonArgument.getName())));
-                        classMapping.addMethodMapping(methodMapping);
-                    });
+            MethodMapping methodMapping = readMethod(jsonConstructor.isStatics() ? "<clinit>" : "<init>", null, jsonConstructor.getSignature());
+            jsonConstructor.getArgs().forEach(jsonArgument -> methodMapping.addArgumentMapping(readArgument(jsonArgument.getIndex(), jsonArgument.getName())));
+            classMapping.addMethodMapping(methodMapping);
+        });
 
         jsonClass.getMethod().forEach(jsonMethod -> {
             MethodMapping methodMapping = readMethod(jsonMethod.getObf(), jsonMethod.getName(), jsonMethod.getSignature());
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java b/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
index 1a93604..a23a33f 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
@@ -18,7 +18,7 @@ public class MappingsReaderOld {
         Deque<Object> mappingStack = Queues.newArrayDeque();
 
         int lineNumber = 0;
-        String line = null;
+        String line;
         while ((line = in.readLine()) != null) {
             lineNumber++;
 
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
index de1635a..2b112a2 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -129,9 +129,7 @@ public class MappingsRenamer {
     }
 
     public void removeMethodTreeMapping(MethodEntry obf) {
-        for (MethodEntry implementation : m_index.getRelatedMethodImplementations(obf)) {
-            removeMethodMapping(implementation);
-        }
+        m_index.getRelatedMethodImplementations(obf).forEach(this::removeMethodMapping);
     }
 
     public void removeMethodMapping(MethodEntry obf) {
@@ -140,9 +138,7 @@ public class MappingsRenamer {
     }
 
     public void markMethodTreeAsDeobfuscated(MethodEntry obf) {
-        for (MethodEntry implementation : m_index.getRelatedMethodImplementations(obf)) {
-            markMethodAsDeobfuscated(implementation);
-        }
+        m_index.getRelatedMethodImplementations(obf).forEach(this::markMethodAsDeobfuscated);
     }
 
     public void markMethodAsDeobfuscated(MethodEntry obf) {
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java
index aaab22f..bfd6063 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java
@@ -76,7 +76,7 @@ public class MappingsWriter {
     }
 
     private <T extends Comparable<T>> List<T> sorted(Iterable<T> classes) {
-        List<T> out = new ArrayList<T>();
+        List<T> out = new ArrayList<>();
         for (T t : classes) {
             out.add(t);
         }
diff --git a/src/main/java/cuchaz/enigma/mapping/Signature.java b/src/main/java/cuchaz/enigma/mapping/Signature.java
index 117018a..e2f9f09 100644
--- a/src/main/java/cuchaz/enigma/mapping/Signature.java
+++ b/src/main/java/cuchaz/enigma/mapping/Signature.java
@@ -91,10 +91,7 @@ public class Signature implements Serializable {
 
     @Override
     public boolean equals(Object other) {
-        if (other instanceof Signature) {
-            return equals((Signature) other);
-        }
-        return false;
+        return other instanceof Signature && equals((Signature) other);
     }
 
     public boolean equals(Signature other) {
diff --git a/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java b/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java
index dac692e..9864333 100644
--- a/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java
+++ b/src/main/java/cuchaz/enigma/mapping/SignatureUpdater.java
@@ -28,7 +28,7 @@ public class SignatureUpdater {
 
             // read the signature character-by-character
             StringReader reader = new StringReader(signature);
-            int i = -1;
+            int i;
             while ((i = reader.read()) != -1) {
                 char c = (char) i;
 
@@ -60,7 +60,7 @@ public class SignatureUpdater {
         // remember to treat generics correctly
         StringBuilder buf = new StringBuilder();
         int depth = 0;
-        int i = -1;
+        int i;
         while ((i = reader.read()) != -1) {
             char c = (char) i;
 
@@ -82,12 +82,9 @@ public class SignatureUpdater {
 
     public static List<String> getClasses(String signature) {
         final List<String> classNames = Lists.newArrayList();
-        update(signature, new ClassNameUpdater() {
-            @Override
-            public String update(String className) {
-                classNames.add(className);
-                return className;
-            }
+        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 2829a75..1947d1c 100644
--- a/src/main/java/cuchaz/enigma/mapping/Translator.java
+++ b/src/main/java/cuchaz/enigma/mapping/Translator.java
@@ -24,12 +24,7 @@ public class Translator {
     private Map<String, ClassMapping> m_classes;
     private TranslationIndex m_index;
 
-    private ClassNameReplacer m_classNameReplacer = new ClassNameReplacer() {
-        @Override
-        public String replace(String className) {
-            return translateEntry(new ClassEntry(className)).getName();
-        }
-    };
+    private ClassNameReplacer m_classNameReplacer = className -> translateEntry(new ClassEntry(className)).getName();
 
     public Translator() {
         m_direction = null;
@@ -76,7 +71,7 @@ public class Translator {
         } else if (entry instanceof MethodEntry) {
             return translate((MethodEntry) entry);
         } else if (entry instanceof ConstructorEntry) {
-            return translate((ConstructorEntry) entry);
+            return translate(entry);
         } else if (entry instanceof ArgumentEntry) {
             return translate((ArgumentEntry) entry);
         } else {
diff --git a/src/main/java/cuchaz/enigma/mapping/Type.java b/src/main/java/cuchaz/enigma/mapping/Type.java
index bfd836c..f2fd34d 100644
--- a/src/main/java/cuchaz/enigma/mapping/Type.java
+++ b/src/main/java/cuchaz/enigma/mapping/Type.java
@@ -205,10 +205,7 @@ public class Type implements Serializable {
 
     @Override
     public boolean equals(Object other) {
-        if (other instanceof Type) {
-            return equals((Type) other);
-        }
-        return false;
+        return other instanceof Type && equals((Type) other);
     }
 
     public boolean equals(Type other) {
@@ -222,7 +219,6 @@ public class Type implements Serializable {
     private static int countArrayDimension(String in) {
         int i = 0;
         for (; i < in.length() && in.charAt(i) == '['; i++) {
-            ;
         }
         return i;
     }