From a83bbfd5c510367a194073b1db132022cacf65ed Mon Sep 17 00:00:00 2001
From: jeff
Date: Tue, 30 Sep 2014 00:25:36 -0400
Subject: fixed nasty issue with renaming inner classes, but alas, more bugs
 remain

---
 src/cuchaz/enigma/analysis/JarIndex.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/cuchaz/enigma/analysis/JarIndex.java')

diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java
index 604e485..ba08206 100644
--- a/src/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/cuchaz/enigma/analysis/JarIndex.java
@@ -164,9 +164,10 @@ public class JarIndex
 				String outerClassName = findOuterClass( c );
 				if( outerClassName != null )
 				{
-					String innerClassName = Descriptor.toJvmName( c.getName() );
+					String innerClassName = c.getSimpleName();
 					m_innerClasses.put( outerClassName, innerClassName );
-					m_outerClasses.put( innerClassName, outerClassName );
+					boolean innerWasAdded = m_outerClasses.put( innerClassName, outerClassName ) == null;
+					assert( innerWasAdded );
 					
 					BehaviorEntry enclosingBehavior = isAnonymousClass( c, outerClassName );
 					if( enclosingBehavior != null )
@@ -188,7 +189,7 @@ public class JarIndex
 			Map<String,String> renames = Maps.newHashMap();
 			for( Map.Entry<String,String> entry : m_outerClasses.entrySet() )
 			{
-				renames.put( entry.getKey(), entry.getValue() + "$" + new ClassEntry( entry.getKey() ).getSimpleName() );
+				renames.put( Constants.NonePackage + "/" + entry.getKey(), entry.getValue() + "$" + entry.getKey() );
 			}
 			EntryRenamer.renameClassesInSet( renames, m_obfClassEntries );
 			m_translationIndex.renameClasses( renames );
-- 
cgit v1.2.3