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/bytecode/ClassTranslator.java | 104 ++++++++++--------------
 1 file changed, 45 insertions(+), 59 deletions(-)

(limited to 'src/cuchaz/enigma/bytecode/ClassTranslator.java')

diff --git a/src/cuchaz/enigma/bytecode/ClassTranslator.java b/src/cuchaz/enigma/bytecode/ClassTranslator.java
index 181fadb..bc12405 100644
--- a/src/cuchaz/enigma/bytecode/ClassTranslator.java
+++ b/src/cuchaz/enigma/bytecode/ClassTranslator.java
@@ -28,116 +28,102 @@ import cuchaz.enigma.mapping.FieldEntry;
 import cuchaz.enigma.mapping.MethodEntry;
 import cuchaz.enigma.mapping.Translator;
 
-public class ClassTranslator
-{
+public class ClassTranslator {
+	
 	private Translator m_translator;
 	
-	public ClassTranslator( Translator translator )
-	{
+	public ClassTranslator(Translator translator) {
 		m_translator = translator;
 	}
 	
-	public void translate( CtClass c )
-	{
+	public void translate(CtClass c) {
 		// NOTE: the order of these translations is very important
 		
 		// translate all the field and method references in the code by editing the constant pool
 		ConstPool constants = c.getClassFile().getConstPool();
-		ConstPoolEditor editor = new ConstPoolEditor( constants );
-		for( int i=1; i<constants.getSize(); i++ )
-		{
-			switch( constants.getTag( i ) )
-			{
-				case ConstPool.CONST_Fieldref:
-				{
+		ConstPoolEditor editor = new ConstPoolEditor(constants);
+		for (int i = 1; i < constants.getSize(); i++) {
+			switch (constants.getTag(i)) {
+				case ConstPool.CONST_Fieldref: {
 					// translate the name
 					FieldEntry entry = new FieldEntry(
-						new ClassEntry( Descriptor.toJvmName( constants.getFieldrefClassName( i ) ) ),
-						constants.getFieldrefName( i )
+						new ClassEntry(Descriptor.toJvmName(constants.getFieldrefClassName(i))),
+						constants.getFieldrefName(i)
 					);
-					FieldEntry translatedEntry = m_translator.translateEntry( entry );
+					FieldEntry translatedEntry = m_translator.translateEntry(entry);
 					
 					// translate the type
-					String type = constants.getFieldrefType( i );
-					String translatedType = m_translator.translateSignature( type );
+					String type = constants.getFieldrefType(i);
+					String translatedType = m_translator.translateSignature(type);
 					
-					if( !entry.equals( translatedEntry ) || !type.equals( translatedType ) )
-					{
-						editor.changeMemberrefNameAndType( i, translatedEntry.getName(), translatedType );
+					if (!entry.equals(translatedEntry) || !type.equals(translatedType)) {
+						editor.changeMemberrefNameAndType(i, translatedEntry.getName(), translatedType);
 					}
 				}
 				break;
 				
 				case ConstPool.CONST_Methodref:
-				case ConstPool.CONST_InterfaceMethodref:
-				{
+				case ConstPool.CONST_InterfaceMethodref: {
 					// translate the name and type
 					BehaviorEntry entry = BehaviorEntryFactory.create(
-						Descriptor.toJvmName( editor.getMemberrefClassname( i ) ),
-						editor.getMemberrefName( i ),
-						editor.getMemberrefType( i )
+						Descriptor.toJvmName(editor.getMemberrefClassname(i)),
+						editor.getMemberrefName(i),
+						editor.getMemberrefType(i)
 					);
-					BehaviorEntry translatedEntry = m_translator.translateEntry( entry );
+					BehaviorEntry translatedEntry = m_translator.translateEntry(entry);
 					
-					if( !entry.getName().equals( translatedEntry.getName() ) || !entry.getSignature().equals( translatedEntry.getSignature() ) )
-					{
-						editor.changeMemberrefNameAndType( i, translatedEntry.getName(), translatedEntry.getSignature() );
+					if (!entry.getName().equals(translatedEntry.getName()) || !entry.getSignature().equals(translatedEntry.getSignature())) {
+						editor.changeMemberrefNameAndType(i, translatedEntry.getName(), translatedEntry.getSignature());
 					}
 				}
 				break;
 			}
 		}
 		
-		ClassEntry classEntry = new ClassEntry( Descriptor.toJvmName( c.getName() ) );
+		ClassEntry classEntry = new ClassEntry(Descriptor.toJvmName(c.getName()));
 		
 		// translate all the fields
-		for( CtField field : c.getDeclaredFields() )
-		{
+		for (CtField field : c.getDeclaredFields()) {
+			
 			// translate the name
-			FieldEntry entry = new FieldEntry( classEntry, field.getName() );
-			String translatedName = m_translator.translate( entry );
-			if( translatedName != null )
-			{
-				field.setName( translatedName );
+			FieldEntry entry = new FieldEntry(classEntry, field.getName());
+			String translatedName = m_translator.translate(entry);
+			if (translatedName != null) {
+				field.setName(translatedName);
 			}
 			
 			// translate the type
-			String translatedType = m_translator.translateSignature( field.getFieldInfo().getDescriptor() );
-			field.getFieldInfo().setDescriptor( translatedType );
+			String translatedType = m_translator.translateSignature(field.getFieldInfo().getDescriptor());
+			field.getFieldInfo().setDescriptor(translatedType);
 		}
 		
 		// translate all the methods and constructors
-		for( CtBehavior behavior : c.getDeclaredBehaviors() )
-		{
-			if( behavior instanceof CtMethod )
-			{
+		for (CtBehavior behavior : c.getDeclaredBehaviors()) {
+			if (behavior instanceof CtMethod) {
 				CtMethod method = (CtMethod)behavior;
 				
 				// translate the name
-				MethodEntry entry = new MethodEntry( classEntry, method.getName(), method.getSignature() );
-				String translatedName = m_translator.translate( entry );
-				if( translatedName != null )
-				{
-					method.setName( translatedName );
+				MethodEntry entry = new MethodEntry(classEntry, method.getName(), method.getSignature());
+				String translatedName = m_translator.translate(entry);
+				if (translatedName != null) {
+					method.setName(translatedName);
 				}
 			}
-
+			
 			// translate the type
-			String translatedSignature = m_translator.translateSignature( behavior.getMethodInfo().getDescriptor() );
-			behavior.getMethodInfo().setDescriptor( translatedSignature );
+			String translatedSignature = m_translator.translateSignature(behavior.getMethodInfo().getDescriptor());
+			behavior.getMethodInfo().setDescriptor(translatedSignature);
 		}
 		
 		// translate all the class names referenced in the code
 		// the above code only changed method/field/reference names and types, but not the class names themselves
 		Map<ClassEntry,ClassEntry> map = Maps.newHashMap();
-		for( ClassEntry obfClassEntry : ClassRenamer.getAllClassEntries( c ) )
-		{
-			ClassEntry deobfClassEntry = m_translator.translateEntry( obfClassEntry );
-			if( !obfClassEntry.equals( deobfClassEntry ) )
-			{
-				map.put( obfClassEntry, deobfClassEntry );
+		for (ClassEntry obfClassEntry : ClassRenamer.getAllClassEntries(c)) {
+			ClassEntry deobfClassEntry = m_translator.translateEntry(obfClassEntry);
+			if (!obfClassEntry.equals(deobfClassEntry)) {
+				map.put(obfClassEntry, deobfClassEntry);
 			}
 		}
-		ClassRenamer.renameClasses( c, map );
+		ClassRenamer.renameClasses(c, map);
 	}
 }
-- 
cgit v1.2.3