From 959cb5fd4f9586ec3bd265b452fe25fe1db82e3f Mon Sep 17 00:00:00 2001
From: jeff
Date: Tue, 13 Jan 2015 23:25:04 -0500
Subject: source format change don't hate me too much if you were planning a
 big merge. =P

---
 src/cuchaz/enigma/mapping/NameValidator.java | 79 +++++++++++-----------------
 1 file changed, 31 insertions(+), 48 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 c6ae596..35a17f9 100644
--- a/src/cuchaz/enigma/mapping/NameValidator.java
+++ b/src/cuchaz/enigma/mapping/NameValidator.java
@@ -16,82 +16,65 @@ import java.util.regex.Pattern;
 
 import javassist.bytecode.Descriptor;
 
-public class NameValidator
-{
+public class NameValidator {
+	
 	private static final Pattern IdentifierPattern;
 	private static final Pattern ClassPattern;
 	private static final List<String> ReservedWords = Arrays.asList(
-		"abstract", "continue", "for", "new", "switch",
-		"assert", "default", "goto", "package", "synchronized",
-		"boolean", "do", "if", "private", "this",
-		"break", "double", "implements", "protected", "throw",
-		"byte", "else", "import", "public", "throws",
-		"case", "enum", "instanceof", "return", "transient",
-		"catch", "extends", "int", "short", "try",
-		"char", "final", "interface", "static", "void",
-		"class", "finally", "long", "strictfp", "volatile",
-		"const", "float", "native", "super", "while"
+		"abstract", "continue", "for", "new", "switch", "assert", "default", "goto", "package", "synchronized",
+		"boolean", "do", "if", "private", "this", "break", "double", "implements", "protected", "throw", "byte",
+		"else", "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", "catch",
+		"extends", "int", "short", "try", "char", "final", "interface", "static", "void", "class", "finally",
+		"long", "strictfp", "volatile", "const", "float", "native", "super", "while"
 	);
 	
-	static
-	{
+	static {
+		
 		// java allows all kinds of weird characters...
 		StringBuilder startChars = new StringBuilder();
 		StringBuilder partChars = new StringBuilder();
-		for( int i = Character.MIN_CODE_POINT; i <= Character.MAX_CODE_POINT; i++ )
-		{
-			if( Character.isJavaIdentifierStart( i ) )
-			{
-				startChars.appendCodePoint( i );
+		for (int i = Character.MIN_CODE_POINT; i <= Character.MAX_CODE_POINT; i++) {
+			if (Character.isJavaIdentifierStart(i)) {
+				startChars.appendCodePoint(i);
 			}
-			if( Character.isJavaIdentifierPart( i ) )
-			{
-				partChars.appendCodePoint( i );
+			if (Character.isJavaIdentifierPart(i)) {
+				partChars.appendCodePoint(i);
 			}
 		}
 		
 		String identifierRegex = "[A-Za-z_<][A-Za-z0-9_>]*";
-		IdentifierPattern = Pattern.compile( identifierRegex );
-		ClassPattern = Pattern.compile( String.format( "^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex ) );
+		IdentifierPattern = Pattern.compile(identifierRegex);
+		ClassPattern = Pattern.compile(String.format("^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex));
 	}
 	
-	public static String validateClassName( String name, boolean packageRequired )
-	{
-		if( name == null )
-		{
+	public static String validateClassName(String name, boolean packageRequired) {
+		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" );
+		if (!ClassPattern.matcher(name).matches() || ReservedWords.contains(name)) {
+			throw new IllegalNameException(name, "This doesn't look like a legal class name");
 		}
-		if( packageRequired && new ClassEntry( name ).getPackageName() == null )
-		{
-			throw new IllegalNameException( name, "Class must be in a package" );
+		if (packageRequired && new ClassEntry(name).getPackageName() == null) {
+			throw new IllegalNameException(name, "Class must be in a package");
 		}
-		return Descriptor.toJvmName( name );
+		return Descriptor.toJvmName(name);
 	}
 	
-	public static String validateFieldName( String name )
-	{
-		if( name == null )
-		{
+	public static String validateFieldName(String 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" );
+		if (!IdentifierPattern.matcher(name).matches() || ReservedWords.contains(name)) {
+			throw new IllegalNameException(name, "This doesn't look like a legal identifier");
 		}
 		return name;
 	}
 	
-	public static String validateMethodName( String name )
-	{
-		return validateFieldName( name );
+	public static String validateMethodName(String name) {
+		return validateFieldName(name);
 	}
 	
-	public static String validateArgumentName( String name )
-	{
-		return validateFieldName( name );
+	public static String validateArgumentName(String name) {
+		return validateFieldName(name);
 	}
 }
-- 
cgit v1.2.3