fix unintentional compile time transitive dependency on procyon

4 files changed, 52 insertions, 47 deletions

diff --git a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
index eb120b66..3a176ffc 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java
@@ -31,9 +31,9 @@ import cuchaz.enigma.mapping.ArgumentEntry;
 import cuchaz.enigma.mapping.BehaviorEntry;
 import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.ConstructorEntry;
-import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.FieldEntry;
 import cuchaz.enigma.mapping.MethodEntry;
+import cuchaz.enigma.mapping.ProcyonEntryFactory;
 import cuchaz.enigma.mapping.Signature;
 import cuchaz.enigma.mapping.Type;
 
@@ -113,7 +113,7 @@ public class SourceIndexBehaviorVisitor extends SourceIndexVisitor {
                 ParameterDefinition def = node.getUserData(Keys.PARAMETER_DEFINITION);
                 if (def.getMethod() instanceof MethodDefinition) {
                         MethodDefinition methodDef = (MethodDefinition)def.getMethod();
-                        BehaviorEntry behaviorEntry = EntryFactory.getBehaviorEntry(methodDef);
+                        BehaviorEntry behaviorEntry = ProcyonEntryFactory.getBehaviorEntry(methodDef);
                         ArgumentEntry argumentEntry = new ArgumentEntry(behaviorEntry, def.getPosition(), node.getName());
                         index.addDeclaration(node.getNameToken(), argumentEntry);
                 }
diff --git a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
index f4202b5b..37a893d7 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
@@ -28,8 +28,8 @@ import com.strobel.decompiler.languages.java.ast.VariableInitializer;
 import cuchaz.enigma.mapping.BehaviorEntry;
 import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.ConstructorEntry;
-import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.FieldEntry;
+import cuchaz.enigma.mapping.ProcyonEntryFactory;
 
 public class SourceIndexClassVisitor extends SourceIndexVisitor {
         
@@ -67,7 +67,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
         @Override
         public Void visitMethodDeclaration(MethodDeclaration node, SourceIndex index) {
                 MethodDefinition def = node.getUserData(Keys.METHOD_DEFINITION);
-                BehaviorEntry behaviorEntry = EntryFactory.getBehaviorEntry(def);
+                BehaviorEntry behaviorEntry = ProcyonEntryFactory.getBehaviorEntry(def);
                 AstNode tokenNode = node.getNameToken();
                 
                 if (behaviorEntry instanceof ConstructorEntry) {
@@ -84,7 +84,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
         @Override
         public Void visitConstructorDeclaration(ConstructorDeclaration node, SourceIndex index) {
                 MethodDefinition def = node.getUserData(Keys.METHOD_DEFINITION);
-                ConstructorEntry constructorEntry = EntryFactory.getConstructorEntry(def);
+                ConstructorEntry constructorEntry = ProcyonEntryFactory.getConstructorEntry(def);
                 index.addDeclaration(node.getNameToken(), constructorEntry);
                 return node.acceptVisitor(new SourceIndexBehaviorVisitor(constructorEntry), index);
         }
@@ -92,7 +92,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
         @Override
         public Void visitFieldDeclaration(FieldDeclaration node, SourceIndex index) {
                 FieldDefinition def = node.getUserData(Keys.FIELD_DEFINITION);
-                FieldEntry fieldEntry = EntryFactory.getFieldEntry(def);
+                FieldEntry fieldEntry = ProcyonEntryFactory.getFieldEntry(def);
                 assert (node.getVariables().size() == 1);
                 VariableInitializer variable = node.getVariables().firstOrNullObject();
                 index.addDeclaration(variable.getNameToken(), fieldEntry);
@@ -104,7 +104,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
         public Void visitEnumValueDeclaration(EnumValueDeclaration node, SourceIndex index) {
                 // treat enum declarations as field declarations
                 FieldDefinition def = node.getUserData(Keys.FIELD_DEFINITION);
-                FieldEntry fieldEntry = EntryFactory.getFieldEntry(def);
+                FieldEntry fieldEntry = ProcyonEntryFactory.getFieldEntry(def);
                 index.addDeclaration(node.getNameToken(), fieldEntry);
                 
                 return recurse(node, index);
diff --git a/src/cuchaz/enigma/mapping/EntryFactory.java b/src/cuchaz/enigma/mapping/EntryFactory.java
index 69c1630f..af96eb35 100644
--- a/src/cuchaz/enigma/mapping/EntryFactory.java
+++ b/src/cuchaz/enigma/mapping/EntryFactory.java
@@ -11,9 +11,6 @@ import javassist.expr.FieldAccess;
 import javassist.expr.MethodCall;
 import javassist.expr.NewExpr;
 
-import com.strobel.assembler.metadata.FieldDefinition;
-import com.strobel.assembler.metadata.MethodDefinition;
-
 import cuchaz.enigma.analysis.JarIndex;
 
 public class EntryFactory {
@@ -55,14 +52,6 @@ public class EntryFactory {
                 );
         }
         
-        public static FieldEntry getFieldEntry(FieldDefinition def) {
-                return new FieldEntry(
-                        new ClassEntry(def.getDeclaringType().getInternalName()),
-                        def.getName(),
-                        new Type(def.getErasedSignature())
-                );
-        }
-        
         public static FieldEntry getFieldEntry(String className, String name, String type) {
                 return new FieldEntry(new ClassEntry(className), name, new Type(type));
         }
@@ -91,14 +80,6 @@ public class EntryFactory {
                 );
         }
         
-        public static MethodEntry getMethodEntry(MethodDefinition def) {
-                return new MethodEntry(
-                        new ClassEntry(def.getDeclaringType().getInternalName()),
-                        def.getName(),
-                        new Signature(def.getErasedSignature())
-                );
-        }
-        
         public static ConstructorEntry getConstructorEntry(CtConstructor constructor) {
                 if (constructor.isClassInitializer()) {
                         return new ConstructorEntry(
@@ -126,19 +107,6 @@ public class EntryFactory {
                 );
         }
         
-        public static ConstructorEntry getConstructorEntry(MethodDefinition def) {
-                if (def.isTypeInitializer()) {
-                        return new ConstructorEntry(
-                                new ClassEntry(def.getDeclaringType().getInternalName())
-                        );
-                } else {
-                        return new ConstructorEntry(
-                                new ClassEntry(def.getDeclaringType().getInternalName()),
-                                new Signature(def.getErasedSignature())
-                        );
-                }
-        }
-        
         public static BehaviorEntry getBehaviorEntry(CtBehavior behavior) {
                 if (behavior instanceof CtMethod) {
                         return getMethodEntry((CtMethod)behavior);
@@ -178,14 +146,6 @@ public class EntryFactory {
                 }
         }
         
-        public static BehaviorEntry getBehaviorEntry(MethodDefinition def) {
-                if (def.isConstructor() || def.isTypeInitializer()) {
-                        return getConstructorEntry(def);
-                } else {
-                        return getMethodEntry(def);
-                }
-        }
-        
         public static BehaviorEntry getObfBehaviorEntry(ClassEntry classEntry, MethodMapping methodMapping) {
                 return getBehaviorEntry(classEntry, methodMapping.getObfName(), methodMapping.getObfSignature());
         }
diff --git a/src/cuchaz/enigma/mapping/ProcyonEntryFactory.java b/src/cuchaz/enigma/mapping/ProcyonEntryFactory.java
new file mode 100644
index 00000000..eb0563c2
--- /dev/null
+++ b/src/cuchaz/enigma/mapping/ProcyonEntryFactory.java
@@ -0,0 +1,45 @@
+package cuchaz.enigma.mapping;
+
+import com.strobel.assembler.metadata.FieldDefinition;
+import com.strobel.assembler.metadata.MethodDefinition;
+
+
+public class ProcyonEntryFactory {
+        
+        public static FieldEntry getFieldEntry(FieldDefinition def) {
+                return new FieldEntry(
+                        new ClassEntry(def.getDeclaringType().getInternalName()),
+                        def.getName(),
+                        new Type(def.getErasedSignature())
+                );
+        }
+        
+        public static MethodEntry getMethodEntry(MethodDefinition def) {
+                return new MethodEntry(
+                        new ClassEntry(def.getDeclaringType().getInternalName()),
+                        def.getName(),
+                        new Signature(def.getErasedSignature())
+                );
+        }
+        
+        public static ConstructorEntry getConstructorEntry(MethodDefinition def) {
+                if (def.isTypeInitializer()) {
+                        return new ConstructorEntry(
+                                new ClassEntry(def.getDeclaringType().getInternalName())
+                        );
+                } else {
+                        return new ConstructorEntry(
+                                new ClassEntry(def.getDeclaringType().getInternalName()),
+                                new Signature(def.getErasedSignature())
+                        );
+                }
+        }
+        
+        public static BehaviorEntry getBehaviorEntry(MethodDefinition def) {
+                if (def.isConstructor() || def.isTypeInitializer()) {
+                        return getConstructorEntry(def);
+                } else {
+                        return getMethodEntry(def);
+                }
+        }
+}