From 9809078524bd3bd40fbf7aa411f6e0dca02fd009 Mon Sep 17 00:00:00 2001
From: jeff
Date: Wed, 25 Feb 2015 22:42:34 -0500
Subject: 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

---
 src/cuchaz/enigma/analysis/JarIndex.java | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'src/cuchaz/enigma/analysis')

diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java
index 1afcb76..e0a8bf5 100644
--- a/src/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/cuchaz/enigma/analysis/JarIndex.java
@@ -12,6 +12,7 @@ package cuchaz.enigma.analysis;
 
 import java.lang.reflect.Modifier;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -156,11 +157,8 @@ public class JarIndex {
 			
 			// step 6: update other indices with inner class info
 			Map<String,String> renames = Maps.newHashMap();
-			for (Map.Entry<ClassEntry,ClassEntry> mapEntry : m_innerClassesByOuter.entries()) {
-				ClassEntry outerClassEntry = mapEntry.getKey();
-				ClassEntry innerClassEntry = mapEntry.getValue();
-				outerClassEntry = EntryFactory.getChainedOuterClassName(this, outerClassEntry);
-				String newName = outerClassEntry.getName() + "$" + innerClassEntry.getSimpleName();
+			for (ClassEntry innerClassEntry : m_innerClassesByOuter.values()) {
+				String newName = innerClassEntry.buildClassEntry(getObfClassChain(innerClassEntry)).getName();
 				if (!innerClassEntry.getName().equals(newName)) {
 					// DEBUG
 					//System.out.println("REPLACE: " + innerClassEntry.getName() + " WITH " + newName);
@@ -780,4 +778,25 @@ public class JarIndex {
 	public MethodEntry getBridgedMethod(MethodEntry bridgeMethodEntry) {
 		return m_bridgedMethods.get(bridgeMethodEntry);
 	}
+
+	public List<ClassEntry> getObfClassChain(ClassEntry obfClassEntry) {
+		
+		// build class chain in inner-to-outer order
+		List<ClassEntry> obfClassChain = Lists.newArrayList(obfClassEntry);
+		ClassEntry checkClassEntry = obfClassEntry;
+		while (true) {
+			ClassEntry obfOuterClassEntry = getOuterClass(checkClassEntry);
+			if (obfOuterClassEntry != null) {
+				obfClassChain.add(obfOuterClassEntry);
+				checkClassEntry = obfOuterClassEntry;
+			} else {
+				break;
+			}
+		}
+		
+		// switch to outer-to-inner order
+		Collections.reverse(obfClassChain);
+		
+		return obfClassChain;
+	}
 }
-- 
cgit v1.2.3