From b5338883d271779c335842c07047d60136316167 Mon Sep 17 00:00:00 2001
From: jeff
Date: Wed, 3 Sep 2014 00:20:36 -0400
Subject: big refactor to better model class/method mappings with no deobf name

---
 src/cuchaz/enigma/mapping/MappingsRenamer.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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

diff --git a/src/cuchaz/enigma/mapping/MappingsRenamer.java b/src/cuchaz/enigma/mapping/MappingsRenamer.java
index 9d036d8..f84b248 100644
--- a/src/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -46,9 +46,11 @@ public class MappingsRenamer
 		}
 		else
 		{
-			m_mappings.m_classesByDeobf.remove( classMapping.getDeobfName() );
+			boolean wasRemoved = m_mappings.m_classesByDeobf.remove( classMapping.getDeobfName() ) != null;
+			assert( wasRemoved );
 			classMapping.setDeobfName( deobfName );
-			m_mappings.m_classesByDeobf.put( deobfName, classMapping );
+			boolean wasAdded = m_mappings.m_classesByDeobf.put( deobfName, classMapping ) == null;
+			assert( wasAdded );
 		}
 		
 		updateDeobfMethodSignatures();
@@ -132,9 +134,11 @@ public class MappingsRenamer
 		ClassMapping classMapping = m_mappings.m_classesByObf.get( obfClassName );
 		if( classMapping == null )
 		{
-			classMapping = new ClassMapping( obfClassName, obfClassName );
-			m_mappings.m_classesByObf.put( classMapping.getObfName(), classMapping );
-			m_mappings.m_classesByDeobf.put( classMapping.getDeobfName(), classMapping );
+			classMapping = new ClassMapping( obfClassName );
+			boolean obfWasAdded = m_mappings.m_classesByObf.put( classMapping.getObfName(), classMapping ) == null;
+			assert( obfWasAdded );
+			boolean deobfWasAdded = m_mappings.m_classesByDeobf.put( classMapping.getDeobfName(), classMapping ) == null;
+			assert( deobfWasAdded );
 		}
 		return classMapping;
 	}
-- 
cgit v1.2.3