fixed lots of issues with inner class reconstruction, particularly for inner class trees

also fixed lots of issues with reading jars that aren't Minecraft. =P

2 files changed, 21 insertions, 35 deletions

diff --git a/src/cuchaz/enigma/mapping/ClassEntry.java b/src/cuchaz/enigma/mapping/ClassEntry.java
index 69f171a..69e66bc 100644
--- a/src/cuchaz/enigma/mapping/ClassEntry.java
+++ b/src/cuchaz/enigma/mapping/ClassEntry.java
@@ -11,6 +11,7 @@
 package cuchaz.enigma.mapping;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class ClassEntry implements Entry, Serializable {
         
@@ -114,13 +115,28 @@ public class ClassEntry implements Entry, Serializable {
         }
         
         public String getSimpleName() {
-                if (isInnerClass()) {
-                        return getInnerClassName();
-                }
                 int pos = m_name.lastIndexOf('/');
                 if (pos > 0) {
                         return m_name.substring(pos + 1);
                 }
                 return m_name;
         }
+        
+        public ClassEntry buildClassEntry(List<ClassEntry> classChain) {
+                assert(classChain.contains(this));
+                StringBuilder buf = new StringBuilder();
+                for (ClassEntry chainEntry : classChain) {
+                        if (buf.length() == 0) {
+                                buf.append(chainEntry.getName());
+                        } else {
+                                buf.append("$");
+                                buf.append(chainEntry.isInnerClass() ? chainEntry.getInnerClassName() : chainEntry.getSimpleName());
+                        }
+                        
+                        if (chainEntry == this) {
+                                break;
+                        }
+                }
+                return new ClassEntry(buf.toString());
+        }
 }
diff --git a/src/cuchaz/enigma/mapping/EntryFactory.java b/src/cuchaz/enigma/mapping/EntryFactory.java
index bbdfa73..f4d62c8 100644
--- a/src/cuchaz/enigma/mapping/EntryFactory.java
+++ b/src/cuchaz/enigma/mapping/EntryFactory.java
@@ -1,7 +1,5 @@
 package cuchaz.enigma.mapping;
 
-import java.util.List;
-
 import javassist.CtBehavior;
 import javassist.CtClass;
 import javassist.CtConstructor;
@@ -13,7 +11,6 @@ import javassist.expr.FieldAccess;
 import javassist.expr.MethodCall;
 import javassist.expr.NewExpr;
 
-import com.beust.jcommander.internal.Lists;
 import com.strobel.assembler.metadata.MethodDefinition;
 
 import cuchaz.enigma.analysis.JarIndex;
@@ -25,35 +22,8 @@ public class EntryFactory {
         }
         
         public static ClassEntry getObfClassEntry(JarIndex jarIndex, ClassMapping classMapping) {
-                return getChainedOuterClassName(jarIndex, new ClassEntry(classMapping.getObfFullName()));
-        }
-        
-        public static ClassEntry getChainedOuterClassName(JarIndex jarIndex, ClassEntry obfClassEntry) {
-                
-                // lookup the chain of outer classes
-                List<ClassEntry> obfClassChain = Lists.newArrayList(obfClassEntry);
-                ClassEntry checkClassEntry = obfClassEntry;
-                while (true) {
-                        ClassEntry obfOuterClassEntry = jarIndex.getOuterClass(checkClassEntry);
-                        if (obfOuterClassEntry != null) {
-                                obfClassChain.add(obfOuterClassEntry);
-                                checkClassEntry = obfOuterClassEntry;
-                        } else {
-                                break;
-                        }
-                }
-                
-                // build the chained class name
-                StringBuilder buf = new StringBuilder();
-                for (int i=obfClassChain.size()-1; i>=0; i--) {
-                        if (buf.length() == 0) {
-                                buf.append(obfClassChain.get(i).getName());
-                        } else {
-                                buf.append("$");
-                                buf.append(obfClassChain.get(i).getSimpleName());
-                        }
-                }
-                return new ClassEntry(buf.toString());
+                ClassEntry obfClassEntry = new ClassEntry(classMapping.getObfFullName());
+                return obfClassEntry.buildClassEntry(jarIndex.getObfClassChain(obfClassEntry));
         }
         
         public static ClassEntry getDeobfClassEntry(ClassMapping classMapping) {