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/NameValidator.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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

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" );
 		}
-- 
cgit v1.2.3