From 699544e76e63e044d290a75f802d082aa0834ad7 Mon Sep 17 00:00:00 2001
From: jeff
Date: Mon, 4 Aug 2014 23:24:48 -0400
Subject: fixed bug with renaming classes

---
 src/cuchaz/enigma/gui/Gui.java            | 1 +
 src/cuchaz/enigma/mapping/Renamer.java    | 4 ++++
 src/cuchaz/enigma/mapping/Translator.java | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/cuchaz/enigma')

diff --git a/src/cuchaz/enigma/gui/Gui.java b/src/cuchaz/enigma/gui/Gui.java
index 87b9308..1f967c0 100644
--- a/src/cuchaz/enigma/gui/Gui.java
+++ b/src/cuchaz/enigma/gui/Gui.java
@@ -451,6 +451,7 @@ public class Gui
 		// update gui
 		m_frame.setTitle( Constants.Name );
 		setObfClasses( null );
+		setDeobfClasses( null );
 		setSource( null );
 		
 		// update menu
diff --git a/src/cuchaz/enigma/mapping/Renamer.java b/src/cuchaz/enigma/mapping/Renamer.java
index 42ac17d..b7aa35c 100644
--- a/src/cuchaz/enigma/mapping/Renamer.java
+++ b/src/cuchaz/enigma/mapping/Renamer.java
@@ -28,6 +28,7 @@ public class Renamer
 	
 	public void setClassName( ClassEntry obf, String deobfName )
 	{
+		deobfName = NameValidator.validateClassName( deobfName );
 		ClassMapping classMapping = m_mappings.m_classesByObf.get( obf.getName() );
 		if( classMapping == null )
 		{
@@ -43,6 +44,7 @@ public class Renamer
 	
 	public void setFieldName( FieldEntry obf, String deobfName )
 	{
+		deobfName = NameValidator.validateFieldName( deobfName );
 		ClassMapping classMapping = m_mappings.m_classesByObf.get( obf.getClassName() );
 		if( classMapping == null )
 		{
@@ -54,6 +56,7 @@ public class Renamer
 	
 	public void setMethodName( MethodEntry obf, String deobfName )
 	{
+		deobfName = NameValidator.validateMethodName( deobfName );
 		ClassMapping classMapping = m_mappings.m_classesByObf.get( obf.getClassName() );
 		if( classMapping == null )
 		{
@@ -68,6 +71,7 @@ public class Renamer
 	
 	public void setArgumentName( ArgumentEntry obf, String deobfName )
 	{
+		deobfName = NameValidator.validateArgumentName( deobfName );
 		ClassMapping classMapping = m_mappings.m_classesByObf.get( obf.getClassName() );
 		if( classMapping == null )
 		{
diff --git a/src/cuchaz/enigma/mapping/Translator.java b/src/cuchaz/enigma/mapping/Translator.java
index 3dbc103..4ab53bc 100644
--- a/src/cuchaz/enigma/mapping/Translator.java
+++ b/src/cuchaz/enigma/mapping/Translator.java
@@ -19,7 +19,7 @@ import cuchaz.enigma.mapping.SignatureUpdater.ClassNameUpdater;
 public class Translator
 {
 	private TranslationDirection m_direction;
-	private Map<String,ClassMapping> m_classes;
+	/* TEMP */ public Map<String,ClassMapping> m_classes;
 	private Ancestries m_ancestries;
 	
 	protected Translator( TranslationDirection direction, Map<String,ClassMapping> classes, Ancestries ancestries )
-- 
cgit v1.2.3