From af1041731c8c0ce1846ff7e7b6052ed7327a5dbc Mon Sep 17 00:00:00 2001
From: jeff
Date: Mon, 9 Feb 2015 22:23:45 -0500
Subject: fix translation issues, particularly with fields

---
 src/cuchaz/enigma/bytecode/ClassTranslator.java       | 9 ++++-----
 src/cuchaz/enigma/bytecode/MethodParameterWriter.java | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/cuchaz/enigma/bytecode')

diff --git a/src/cuchaz/enigma/bytecode/ClassTranslator.java b/src/cuchaz/enigma/bytecode/ClassTranslator.java
index 4dba0d8..4167731 100644
--- a/src/cuchaz/enigma/bytecode/ClassTranslator.java
+++ b/src/cuchaz/enigma/bytecode/ClassTranslator.java
@@ -23,10 +23,9 @@ import javassist.bytecode.SourceFileAttribute;
 import com.google.common.collect.Maps;
 
 import cuchaz.enigma.mapping.BehaviorEntry;
-import cuchaz.enigma.mapping.BehaviorEntryFactory;
 import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.FieldEntry;
-import cuchaz.enigma.mapping.JavassistUtil;
 import cuchaz.enigma.mapping.MethodEntry;
 import cuchaz.enigma.mapping.Signature;
 import cuchaz.enigma.mapping.Translator;
@@ -74,7 +73,7 @@ public class ClassTranslator {
 				case ConstPool.CONST_InterfaceMethodref: {
 					
 					// translate the name and type
-					BehaviorEntry entry = BehaviorEntryFactory.create(
+					BehaviorEntry entry = EntryFactory.getBehaviorEntry(
 						Descriptor.toJvmName(editor.getMemberrefClassname(i)),
 						editor.getMemberrefName(i),
 						editor.getMemberrefType(i)
@@ -95,7 +94,7 @@ public class ClassTranslator {
 		for (CtField field : c.getDeclaredFields()) {
 			
 			// translate the name
-			FieldEntry entry = JavassistUtil.getFieldEntry(field);
+			FieldEntry entry = EntryFactory.getFieldEntry(field);
 			String translatedName = m_translator.translate(entry);
 			if (translatedName != null) {
 				field.setName(translatedName);
@@ -112,7 +111,7 @@ public class ClassTranslator {
 				CtMethod method = (CtMethod)behavior;
 				
 				// translate the name
-				MethodEntry entry = JavassistUtil.getMethodEntry(method);
+				MethodEntry entry = EntryFactory.getMethodEntry(method);
 				String translatedName = m_translator.translate(entry);
 				if (translatedName != null) {
 					method.setName(translatedName);
diff --git a/src/cuchaz/enigma/bytecode/MethodParameterWriter.java b/src/cuchaz/enigma/bytecode/MethodParameterWriter.java
index 853928c..f64ca02 100644
--- a/src/cuchaz/enigma/bytecode/MethodParameterWriter.java
+++ b/src/cuchaz/enigma/bytecode/MethodParameterWriter.java
@@ -17,7 +17,7 @@ import javassist.CtBehavior;
 import javassist.CtClass;
 import cuchaz.enigma.mapping.ArgumentEntry;
 import cuchaz.enigma.mapping.BehaviorEntry;
-import cuchaz.enigma.mapping.BehaviorEntryFactory;
+import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.Signature;
 import cuchaz.enigma.mapping.Translator;
 
@@ -33,7 +33,7 @@ public class MethodParameterWriter {
 		
 		// Procyon will read method arguments from the "MethodParameters" attribute, so write those
 		for (CtBehavior behavior : c.getDeclaredBehaviors()) {
-			BehaviorEntry behaviorEntry = BehaviorEntryFactory.create(behavior);
+			BehaviorEntry behaviorEntry = EntryFactory.getBehaviorEntry(behavior);
 
 			// get the number of arguments
 			Signature signature = behaviorEntry.getSignature();
-- 
cgit v1.2.3