generalized field matching

added method matching

5 files changed, 38 insertions, 2 deletions

diff --git a/src/cuchaz/enigma/mapping/ClassMapping.java b/src/cuchaz/enigma/mapping/ClassMapping.java
index 43605e5..07fed32 100644
--- a/src/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/cuchaz/enigma/mapping/ClassMapping.java
@@ -434,4 +434,8 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
         public static boolean isSimpleClassName(String name) {
                 return name.indexOf('/') < 0 && name.indexOf('$') < 0;
         }
+
+        public ClassEntry getObfEntry() {
+                return new ClassEntry(m_obfFullName);
+        }
 }
diff --git a/src/cuchaz/enigma/mapping/EntryFactory.java b/src/cuchaz/enigma/mapping/EntryFactory.java
index 333bb09..7bc6183 100644
--- a/src/cuchaz/enigma/mapping/EntryFactory.java
+++ b/src/cuchaz/enigma/mapping/EntryFactory.java
@@ -138,6 +138,10 @@ public class EntryFactory {
         public static BehaviorEntry getBehaviorEntry(String className, String behaviorName, String behaviorSignature) {
                 return getBehaviorEntry(new ClassEntry(className), behaviorName, new Signature(behaviorSignature));
         }
+
+        public static BehaviorEntry getBehaviorEntry(String className, String behaviorName) {
+                return getBehaviorEntry(new ClassEntry(className), behaviorName);
+        }
         
         public static BehaviorEntry getBehaviorEntry(ClassEntry classEntry, String behaviorName, Signature behaviorSignature) {
                 if (behaviorName.equals("<init>")) {
@@ -149,6 +153,14 @@ public class EntryFactory {
                 }
         }
         
+        public static BehaviorEntry getBehaviorEntry(ClassEntry classEntry, String behaviorName) {
+                if(behaviorName.equals("<clinit>")) {
+                        return new ConstructorEntry(classEntry);
+                } else {
+                        throw new IllegalArgumentException("Only class initializers don't have signatures");
+                }
+        }
+        
         public static BehaviorEntry getBehaviorEntry(MethodDefinition def) {
                 if (def.isConstructor() || def.isTypeInitializer()) {
                         return getConstructorEntry(def);
diff --git a/src/cuchaz/enigma/mapping/FieldMapping.java b/src/cuchaz/enigma/mapping/FieldMapping.java
index 55b0a19..1289351 100644
--- a/src/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/cuchaz/enigma/mapping/FieldMapping.java
@@ -12,7 +12,7 @@ package cuchaz.enigma.mapping;
 
 import java.io.Serializable;
 
-public class FieldMapping implements Serializable, Comparable<FieldMapping> {
+public class FieldMapping implements Serializable, Comparable<FieldMapping>, MemberMapping<FieldEntry> {
         
         private static final long serialVersionUID = 8610742471440861315L;
         
@@ -72,4 +72,9 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping> {
                 }
                 return false;
         }
+
+        @Override
+        public FieldEntry getObfEntry(ClassEntry classEntry) {
+                return new FieldEntry(classEntry, m_obfName, new Type(m_obfType));
+        }
 }
diff --git a/src/cuchaz/enigma/mapping/MemberMapping.java b/src/cuchaz/enigma/mapping/MemberMapping.java
new file mode 100644
index 0000000..d62a7c1
--- /dev/null
+++ b/src/cuchaz/enigma/mapping/MemberMapping.java
@@ -0,0 +1,6 @@
+package cuchaz.enigma.mapping;
+
+
+public interface MemberMapping<T extends Entry> {
+        T getObfEntry(ClassEntry classEntry);
+}
diff --git a/src/cuchaz/enigma/mapping/MethodMapping.java b/src/cuchaz/enigma/mapping/MethodMapping.java
index bf8a94f..bf6dacc 100644
--- a/src/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/cuchaz/enigma/mapping/MethodMapping.java
@@ -16,7 +16,7 @@ import java.util.Map.Entry;
 
 import com.google.common.collect.Maps;
 
-public class MethodMapping implements Serializable, Comparable<MethodMapping> {
+public class MethodMapping implements Serializable, Comparable<MethodMapping>, MemberMapping<BehaviorEntry> {
         
         private static final long serialVersionUID = -4409570216084263978L;
         
@@ -170,4 +170,13 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping> {
                 }
                 return false;
         }
+
+        @Override
+        public BehaviorEntry getObfEntry(ClassEntry classEntry) {
+                if (isConstructor()) {
+                        return new ConstructorEntry(classEntry, m_obfSignature);
+                } else {
+                        return new MethodEntry(classEntry, m_obfName, m_obfSignature);
+                }
+        }
 }