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/mapping/MappingsRenamer.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 957b6d6..24ec731 100644
--- a/src/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -16,6 +16,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.zip.GZIPOutputStream;
 
+import cuchaz.enigma.Constants;
 import cuchaz.enigma.analysis.JarIndex;
 
 public class MappingsRenamer
@@ -31,7 +32,7 @@ public class MappingsRenamer
 	
 	public void setClassName( ClassEntry obf, String deobfName )
 	{
-		deobfName = NameValidator.validateClassName( deobfName );
+		deobfName = NameValidator.validateClassName( deobfName, !obf.isInnerClass() );
 		ClassEntry targetEntry = new ClassEntry( deobfName );
 		if( m_mappings.containsDeobfClass( deobfName ) || m_index.containsObfClass( targetEntry ) )
 		{
@@ -77,7 +78,8 @@ public class MappingsRenamer
 		ClassMapping classMapping = getOrCreateClassMapping( obf );
 		if( obf.isInnerClass() )
 		{
-			classMapping.setInnerClassName( obf.getName(), obf.getName() );
+			String innerClassName = Constants.NonePackage + "/" + obf.getInnerClassName();
+			classMapping.setInnerClassName( innerClassName, innerClassName );
 		}
 		else
 		{
-- 
cgit v1.2.3