fix translation issues, particularly with fields

2 files changed, 6 insertions, 6 deletions

diff --git a/src/cuchaz/enigma/convert/ClassIdentity.java b/src/cuchaz/enigma/convert/ClassIdentity.java
index bb729a3..b514012 100644
--- a/src/cuchaz/enigma/convert/ClassIdentity.java
+++ b/src/cuchaz/enigma/convert/ClassIdentity.java
@@ -53,7 +53,7 @@ import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.ClassNameReplacer;
 import cuchaz.enigma.mapping.Entry;
 import cuchaz.enigma.mapping.FieldEntry;
-import cuchaz.enigma.mapping.JavassistUtil;
+import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.Signature;
 
 public class ClassIdentity {
@@ -116,13 +116,13 @@ public class ClassIdentity {
                 m_references = HashMultiset.create();
                 if (useReferences) {
                         for (CtField field : c.getDeclaredFields()) {
-                                FieldEntry fieldEntry = JavassistUtil.getFieldEntry(field);
+                                FieldEntry fieldEntry = EntryFactory.getFieldEntry(field);
                                 for (EntryReference<FieldEntry,BehaviorEntry> reference : index.getFieldReferences(fieldEntry)) {
                                         addReference(reference);
                                 }
                         }
                         for (CtBehavior behavior : c.getDeclaredBehaviors()) {
-                                BehaviorEntry behaviorEntry = JavassistUtil.getBehaviorEntry(behavior);
+                                BehaviorEntry behaviorEntry = EntryFactory.getBehaviorEntry(behavior);
                                 for (EntryReference<BehaviorEntry,BehaviorEntry> reference : index.getBehaviorReferences(behaviorEntry)) {
                                         addReference(reference);
                                 }
diff --git a/src/cuchaz/enigma/convert/ClassMatcher.java b/src/cuchaz/enigma/convert/ClassMatcher.java
index ccf6b78..d70b8eb 100644
--- a/src/cuchaz/enigma/convert/ClassMatcher.java
+++ b/src/cuchaz/enigma/convert/ClassMatcher.java
@@ -42,7 +42,7 @@ import cuchaz.enigma.analysis.JarIndex;
 import cuchaz.enigma.convert.ClassNamer.SidedClassNamer;
 import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.ClassMapping;
-import cuchaz.enigma.mapping.JavassistUtil;
+import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.MappingParseException;
 import cuchaz.enigma.mapping.Mappings;
 import cuchaz.enigma.mapping.MappingsReader;
@@ -242,13 +242,13 @@ public class ClassMatcher {
                                         System.err.println("\tAvailable dest methods:");
                                         CtClass c = destLoader.loadClass(classMapping.getObfName());
                                         for (CtBehavior behavior : c.getDeclaredBehaviors()) {
-                                                System.err.println("\t\t" + JavassistUtil.getBehaviorEntry(behavior));
+                                                System.err.println("\t\t" + EntryFactory.getBehaviorEntry(behavior));
                                         }
                                         
                                         System.err.println("\tAvailable source methods:");
                                         c = sourceLoader.loadClass(matchedClassNames.inverse().get(classMapping.getObfName()));
                                         for (CtBehavior behavior : c.getDeclaredBehaviors()) {
-                                                System.err.println("\t\t" + JavassistUtil.getBehaviorEntry(behavior));
+                                                System.err.println("\t\t" + EntryFactory.getBehaviorEntry(behavior));
                                         }
                                 }
                         }