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/mapping/Mappings.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/cuchaz/enigma/mapping/Mappings.java')

diff --git a/src/cuchaz/enigma/mapping/Mappings.java b/src/cuchaz/enigma/mapping/Mappings.java
index 675fdf1..a85bcbf 100644
--- a/src/cuchaz/enigma/mapping/Mappings.java
+++ b/src/cuchaz/enigma/mapping/Mappings.java
@@ -37,7 +37,7 @@ public class Mappings implements Serializable {
 		this();
 		
 		for (ClassMapping classMapping : classes) {
-			m_classesByObf.put(classMapping.getObfName(), classMapping);
+			m_classesByObf.put(classMapping.getObfFullName(), classMapping);
 			if (classMapping.getDeobfName() != null) {
 				m_classesByDeobf.put(classMapping.getDeobfName(), classMapping);
 			}
@@ -50,10 +50,10 @@ public class Mappings implements Serializable {
 	}
 	
 	public void addClassMapping(ClassMapping classMapping) {
-		if (m_classesByObf.containsKey(classMapping.getObfName())) {
-			throw new Error("Already have mapping for " + classMapping.getObfName());
+		if (m_classesByObf.containsKey(classMapping.getObfFullName())) {
+			throw new Error("Already have mapping for " + classMapping.getObfFullName());
 		}
-		boolean obfWasAdded = m_classesByObf.put(classMapping.getObfName(), classMapping) == null;
+		boolean obfWasAdded = m_classesByObf.put(classMapping.getObfFullName(), classMapping) == null;
 		assert (obfWasAdded);
 		if (classMapping.getDeobfName() != null) {
 			if (m_classesByDeobf.containsKey(classMapping.getDeobfName())) {
@@ -65,7 +65,7 @@ public class Mappings implements Serializable {
 	}
 	
 	public void removeClassMapping(ClassMapping classMapping) {
-		boolean obfWasRemoved = m_classesByObf.remove(classMapping.getObfName()) != null;
+		boolean obfWasRemoved = m_classesByObf.remove(classMapping.getObfFullName()) != null;
 		assert (obfWasRemoved);
 		if (classMapping.getDeobfName() != null) {
 			boolean deobfWasRemoved = m_classesByDeobf.remove(classMapping.getDeobfName()) != null;
@@ -103,7 +103,7 @@ public class Mappings implements Serializable {
 					if (classMapping.getDeobfName() != null) {
 						classes.put(classMapping.getDeobfName(), classMapping);
 					} else {
-						classes.put(classMapping.getObfName(), classMapping);
+						classes.put(classMapping.getObfFullName(), classMapping);
 					}
 				}
 				
@@ -144,7 +144,7 @@ public class Mappings implements Serializable {
 		for (ClassMapping classMapping : classes()) {
 			
 			// add the class name
-			classNames.add(classMapping.getObfName());
+			classNames.add(classMapping.getObfFullName());
 			
 			// add classes from method signatures
 			for (MethodMapping methodMapping : classMapping.methods()) {
-- 
cgit v1.2.3