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/MappingsReader.java | 218 ++++++++++----------------
 1 file changed, 83 insertions(+), 135 deletions(-)

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

diff --git a/src/cuchaz/enigma/mapping/MappingsReader.java b/src/cuchaz/enigma/mapping/MappingsReader.java
index 4bd9f12..72e829d 100644
--- a/src/cuchaz/enigma/mapping/MappingsReader.java
+++ b/src/cuchaz/enigma/mapping/MappingsReader.java
@@ -20,209 +20,157 @@ import com.google.common.collect.Queues;
 import cuchaz.enigma.Constants;
 import cuchaz.enigma.mapping.SignatureUpdater.ClassNameUpdater;
 
-public class MappingsReader
-{
-	public Mappings read( Reader in )
-	throws IOException, MappingParseException
-	{
-		return read( new BufferedReader( in ) );
+public class MappingsReader {
+	
+	public Mappings read(Reader in) throws IOException, MappingParseException {
+		return read(new BufferedReader(in));
 	}
 	
-	public Mappings read( BufferedReader in )
-	throws IOException, MappingParseException
-	{
+	public Mappings read(BufferedReader in) throws IOException, MappingParseException {
 		Mappings mappings = new Mappings();
 		Deque<Object> mappingStack = Queues.newArrayDeque();
 		
 		int lineNumber = 0;
 		String line = null;
-		while( ( line = in.readLine() ) != null )
-		{
+		while ( (line = in.readLine()) != null) {
 			lineNumber++;
 			
 			// strip comments
-			int commentPos = line.indexOf( '#' );
-			if( commentPos >= 0 )
-			{
-				line = line.substring( 0, commentPos );
+			int commentPos = line.indexOf('#');
+			if (commentPos >= 0) {
+				line = line.substring(0, commentPos);
 			}
 			
 			// skip blank lines
-			if( line.trim().length() <= 0 )
-			{
+			if (line.trim().length() <= 0) {
 				continue;
 			}
 			
 			// get the indent of this line
 			int indent = 0;
-			for( int i=0; i<line.length(); i++ )
-			{
-				if( line.charAt( i ) != '\t' )
-				{
+			for (int i = 0; i < line.length(); i++) {
+				if (line.charAt(i) != '\t') {
 					break;
 				}
 				indent++;
 			}
 			
 			// handle stack pops
-			while( indent < mappingStack.size() )
-			{
+			while (indent < mappingStack.size()) {
 				mappingStack.pop();
 			}
 			
-			String[] parts = line.trim().split( "\\s" );
-			try
-			{
+			String[] parts = line.trim().split("\\s");
+			try {
 				// read the first token
 				String token = parts[0];
 				
-				if( token.equalsIgnoreCase( "CLASS" ) )
-				{
+				if (token.equalsIgnoreCase("CLASS")) {
 					ClassMapping classMapping;
-					if( indent == 0 )
-					{
+					if (indent == 0) {
 						// outer class
-						classMapping = readClass( parts, false );
-						mappings.addClassMapping( classMapping );
-					}
-					else if( indent == 1 )
-					{
+						classMapping = readClass(parts, false);
+						mappings.addClassMapping(classMapping);
+					} else if (indent == 1) {
 						// inner class
-						if( !( mappingStack.getFirst() instanceof ClassMapping ) )
-						{
-							throw new MappingParseException( lineNumber, "Unexpected CLASS entry here!" );
+						if (! (mappingStack.getFirst() instanceof ClassMapping)) {
+							throw new MappingParseException(lineNumber, "Unexpected CLASS entry here!");
 						}
 						
-						classMapping = readClass( parts, true );
-						((ClassMapping)mappingStack.getFirst()).addInnerClassMapping( classMapping );
+						classMapping = readClass(parts, true);
+						((ClassMapping)mappingStack.getFirst()).addInnerClassMapping(classMapping);
+					} else {
+						throw new MappingParseException(lineNumber, "Unexpected CLASS entry nesting!");
 					}
-					else
-					{
-						throw new MappingParseException( lineNumber, "Unexpected CLASS entry nesting!" );
+					mappingStack.push(classMapping);
+				} else if (token.equalsIgnoreCase("FIELD")) {
+					if (mappingStack.isEmpty() || ! (mappingStack.getFirst() instanceof ClassMapping)) {
+						throw new MappingParseException(lineNumber, "Unexpected FIELD entry here!");
 					}
-					mappingStack.push( classMapping );
-				}
-				else if( token.equalsIgnoreCase( "FIELD" ) )
-				{
-					if( mappingStack.isEmpty() || !(mappingStack.getFirst() instanceof ClassMapping) )
-					{
-						throw new MappingParseException( lineNumber, "Unexpected FIELD entry here!" );
-					}
-					((ClassMapping)mappingStack.getFirst()).addFieldMapping( readField( parts ) );
-				}
-				else if( token.equalsIgnoreCase( "METHOD" ) )
-				{
-					if( mappingStack.isEmpty() || !(mappingStack.getFirst() instanceof ClassMapping) )
-					{
-						throw new MappingParseException( lineNumber, "Unexpected METHOD entry here!" );
+					((ClassMapping)mappingStack.getFirst()).addFieldMapping(readField(parts));
+				} else if (token.equalsIgnoreCase("METHOD")) {
+					if (mappingStack.isEmpty() || ! (mappingStack.getFirst() instanceof ClassMapping)) {
+						throw new MappingParseException(lineNumber, "Unexpected METHOD entry here!");
 					}
-					MethodMapping methodMapping = readMethod( parts );
-					((ClassMapping)mappingStack.getFirst()).addMethodMapping( methodMapping );
-					mappingStack.push( methodMapping );
-				}
-				else if( token.equalsIgnoreCase( "ARG" ) )
-				{
-					if( mappingStack.isEmpty() || !(mappingStack.getFirst() instanceof MethodMapping) )
-					{
-						throw new MappingParseException( lineNumber, "Unexpected ARG entry here!" );
+					MethodMapping methodMapping = readMethod(parts);
+					((ClassMapping)mappingStack.getFirst()).addMethodMapping(methodMapping);
+					mappingStack.push(methodMapping);
+				} else if (token.equalsIgnoreCase("ARG")) {
+					if (mappingStack.isEmpty() || ! (mappingStack.getFirst() instanceof MethodMapping)) {
+						throw new MappingParseException(lineNumber, "Unexpected ARG entry here!");
 					}
-					((MethodMapping)mappingStack.getFirst()).addArgumentMapping( readArgument( parts ) );
+					((MethodMapping)mappingStack.getFirst()).addArgumentMapping(readArgument(parts));
 				}
-			}
-			catch( ArrayIndexOutOfBoundsException | NumberFormatException ex )
-			{
-				throw new MappingParseException( lineNumber, "Malformed line!" );
+			} catch (ArrayIndexOutOfBoundsException | NumberFormatException ex) {
+				throw new MappingParseException(lineNumber, "Malformed line!");
 			}
 		}
 		
 		return mappings;
 	}
-
-	private ArgumentMapping readArgument( String[] parts )
-	{
-		return new ArgumentMapping( Integer.parseInt( parts[1] ), parts[2] );
+	
+	private ArgumentMapping readArgument(String[] parts) {
+		return new ArgumentMapping(Integer.parseInt(parts[1]), parts[2]);
 	}
-
-	private ClassMapping readClass( String[] parts, boolean makeSimple )
-	{
-		if( parts.length == 2 )
-		{
-			String obfName = processName( parts[1], makeSimple );
-			return new ClassMapping( obfName );
-		}
-		else
-		{
-			String obfName = processName( parts[1], makeSimple );
-			String deobfName = processName( parts[2], makeSimple );
-			return new ClassMapping( obfName, deobfName );
+	
+	private ClassMapping readClass(String[] parts, boolean makeSimple) {
+		if (parts.length == 2) {
+			String obfName = processName(parts[1], makeSimple);
+			return new ClassMapping(obfName);
+		} else {
+			String obfName = processName(parts[1], makeSimple);
+			String deobfName = processName(parts[2], makeSimple);
+			return new ClassMapping(obfName, deobfName);
 		}
 	}
 	
-	private String processName( String name, boolean makeSimple )
-	{
-		if( makeSimple )
-		{
-			return new ClassEntry( name ).getSimpleName();
-		}
-		else
-		{
-			return moveClassOutOfDefaultPackage( name, Constants.NonePackage );
+	private String processName(String name, boolean makeSimple) {
+		if (makeSimple) {
+			return new ClassEntry(name).getSimpleName();
+		} else {
+			return moveClassOutOfDefaultPackage(name, Constants.NonePackage);
 		}
 	}
 	
-	private String moveClassOutOfDefaultPackage( String className, String newPackageName )
-	{
-		ClassEntry classEntry = new ClassEntry( className );
-		if( classEntry.isInDefaultPackage() )
-		{
+	private String moveClassOutOfDefaultPackage(String className, String newPackageName) {
+		ClassEntry classEntry = new ClassEntry(className);
+		if (classEntry.isInDefaultPackage()) {
 			return newPackageName + "/" + classEntry.getName();
 		}
 		return className;
 	}
-
-	private FieldMapping readField( String[] parts )
-	{
-		return new FieldMapping( parts[1], parts[2] );
+	
+	private FieldMapping readField(String[] parts) {
+		return new FieldMapping(parts[1], parts[2]);
 	}
 	
-	private MethodMapping readMethod( String[] parts )
-	{
-		if( parts.length == 3 )
-		{
+	private MethodMapping readMethod(String[] parts) {
+		if (parts.length == 3) {
 			String obfName = parts[1];
-			String obfSignature = moveSignatureOutOfDefaultPackage( parts[2], Constants.NonePackage );
-			return new MethodMapping( obfName, obfSignature );
-		}
-		else
-		{
+			String obfSignature = moveSignatureOutOfDefaultPackage(parts[2], Constants.NonePackage);
+			return new MethodMapping(obfName, obfSignature);
+		} else {
 			String obfName = parts[1];
 			String deobfName = parts[2];
-			String obfSignature = moveSignatureOutOfDefaultPackage( parts[3], Constants.NonePackage );
-			if( obfName.equals( deobfName ) )
-			{
-				return new MethodMapping( obfName, obfSignature );
-			}
-			else
-			{
-				return new MethodMapping( obfName, obfSignature, deobfName );
+			String obfSignature = moveSignatureOutOfDefaultPackage(parts[3], Constants.NonePackage);
+			if (obfName.equals(deobfName)) {
+				return new MethodMapping(obfName, obfSignature);
+			} else {
+				return new MethodMapping(obfName, obfSignature, deobfName);
 			}
 		}
 	}
-
-	private String moveSignatureOutOfDefaultPackage( String signature, final String newPackageName )
-	{
-		return SignatureUpdater.update( signature, new ClassNameUpdater( )
-		{
+	
+	private String moveSignatureOutOfDefaultPackage(String signature, final String newPackageName) {
+		return SignatureUpdater.update(signature, new ClassNameUpdater() {
 			@Override
-			public String update( String className )
-			{
-				ClassEntry classEntry = new ClassEntry( className );
-				if( classEntry.isInDefaultPackage() )
-				{
+			public String update(String className) {
+				ClassEntry classEntry = new ClassEntry(className);
+				if (classEntry.isInDefaultPackage()) {
 					return newPackageName + "/" + className;
 				}
 				return className;
 			}
-		} );
+		});
 	}
 }
-- 
cgit v1.2.3