From 2fbcf8e5c4eec0aa4a4fc59c7cc8abac33b1429c Mon Sep 17 00:00:00 2001
From: jeff
Date: Mon, 19 Jan 2015 22:22:57 -0500
Subject: solved tricky issue with incorrect translation of fields/methods
 referenced by a subclass instead of the declaring class

---
 src/cuchaz/enigma/mapping/JavassistUtil.java | 55 ++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/cuchaz/enigma/mapping/JavassistUtil.java

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

diff --git a/src/cuchaz/enigma/mapping/JavassistUtil.java b/src/cuchaz/enigma/mapping/JavassistUtil.java
new file mode 100644
index 0000000..b011e0b
--- /dev/null
+++ b/src/cuchaz/enigma/mapping/JavassistUtil.java
@@ -0,0 +1,55 @@
+package cuchaz.enigma.mapping;
+
+import javassist.CtBehavior;
+import javassist.CtClass;
+import javassist.CtConstructor;
+import javassist.CtField;
+import javassist.CtMethod;
+import javassist.bytecode.Descriptor;
+import cuchaz.enigma.mapping.BehaviorEntry;
+import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.ConstructorEntry;
+import cuchaz.enigma.mapping.FieldEntry;
+import cuchaz.enigma.mapping.MethodEntry;
+
+public class JavassistUtil {
+	
+	public static ClassEntry getClassEntry(CtClass c) {
+		return new ClassEntry(Descriptor.toJvmName(c.getName()));
+	}
+	
+	public static ClassEntry getSuperclassEntry(CtClass c) {
+		return new ClassEntry(Descriptor.toJvmName(c.getClassFile().getSuperclass()));
+	}
+	
+	public static MethodEntry getMethodEntry(CtMethod method) {
+		return new MethodEntry(
+			getClassEntry(method.getDeclaringClass()),
+			method.getName(),
+			method.getMethodInfo().getDescriptor()
+		);
+	}
+	
+	public static ConstructorEntry getConstructorEntry(CtConstructor constructor) {
+		return new ConstructorEntry(
+			getClassEntry(constructor.getDeclaringClass()),
+			constructor.getMethodInfo().getDescriptor()
+		);
+	}
+	
+	public static BehaviorEntry getBehaviorEntry(CtBehavior behavior) {
+		if (behavior instanceof CtMethod) {
+			return getMethodEntry((CtMethod)behavior);
+		} else if (behavior instanceof CtConstructor) {
+			return getConstructorEntry((CtConstructor)behavior);
+		}
+		throw new Error("behavior is neither Method nor Constructor!");
+	}
+	
+	public static FieldEntry getFieldEntry(CtField field) {
+		return new FieldEntry(
+			getClassEntry(field.getDeclaringClass()),
+			field.getName()
+		);
+	}
+}
-- 
cgit v1.2.3