big refactor to better model class/method mappings with no deobf name

1 files changed, 10 insertions, 2 deletions

diff --git a/src/cuchaz/enigma/mapping/NameValidator.java b/src/cuchaz/enigma/mapping/NameValidator.java
index 6df893f..9adf1ac 100644
--- a/src/cuchaz/enigma/mapping/NameValidator.java
+++ b/src/cuchaz/enigma/mapping/NameValidator.java
@@ -57,7 +57,11 @@ public class NameValidator
         
         public static String validateClassName( String name )
         {
-                if( name == null || !ClassPattern.matcher( name ).matches() || ReservedWords.contains( name ) )
+                if( name == null )
+                {
+                        return null;
+                }
+                if( !ClassPattern.matcher( name ).matches() || ReservedWords.contains( name ) )
                 {
                         throw new IllegalNameException( name, "This doesn't look like a legal class name" );
                 }
@@ -70,7 +74,11 @@ public class NameValidator
         
         public static String validateFieldName( String name )
         {
-                if( name == null || !IdentifierPattern.matcher( name ).matches() || ReservedWords.contains( name ) )
+                if( name == null )
+                {
+                        return null;
+                }
+                if( !IdentifierPattern.matcher( name ).matches() || ReservedWords.contains( name ) )
                 {
                         throw new IllegalNameException( name, "This doesn't look like a legal identifier" );
                 }