From 2dc7428e37bdd7a119f53d02ce157675509b0d63 Mon Sep 17 00:00:00 2001
From: jeff
Date: Mon, 23 Feb 2015 23:29:22 -0500
Subject: lots of work in better handling of inner classes also working on
 recognizing unobfuscated and deobfuscated jars (needed for M3L)

---
 src/cuchaz/enigma/convert/ClassMatcher.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/cuchaz/enigma/convert/ClassMatcher.java')

diff --git a/src/cuchaz/enigma/convert/ClassMatcher.java b/src/cuchaz/enigma/convert/ClassMatcher.java
index d70b8eb..224d004 100644
--- a/src/cuchaz/enigma/convert/ClassMatcher.java
+++ b/src/cuchaz/enigma/convert/ClassMatcher.java
@@ -222,7 +222,7 @@ public class ClassMatcher {
 		// check the method matches
 		System.out.println("Checking methods...");
 		for (ClassMapping classMapping : mappings.classes()) {
-			ClassEntry classEntry = new ClassEntry(classMapping.getObfName());
+			ClassEntry classEntry = new ClassEntry(classMapping.getObfFullName());
 			for (MethodMapping methodMapping : classMapping.methods()) {
 				
 				// skip constructors
@@ -240,13 +240,13 @@ public class ClassMatcher {
 					
 					// show the available methods
 					System.err.println("\tAvailable dest methods:");
-					CtClass c = destLoader.loadClass(classMapping.getObfName());
+					CtClass c = destLoader.loadClass(classMapping.getObfFullName());
 					for (CtBehavior behavior : c.getDeclaredBehaviors()) {
 						System.err.println("\t\t" + EntryFactory.getBehaviorEntry(behavior));
 					}
 					
 					System.err.println("\tAvailable source methods:");
-					c = sourceLoader.loadClass(matchedClassNames.inverse().get(classMapping.getObfName()));
+					c = sourceLoader.loadClass(matchedClassNames.inverse().get(classMapping.getObfFullName()));
 					for (CtBehavior behavior : c.getDeclaredBehaviors()) {
 						System.err.println("\t\t" + EntryFactory.getBehaviorEntry(behavior));
 					}
-- 
cgit v1.2.3