working on writing mappings based on all the matches

3 files changed, 26 insertions, 0 deletions

diff --git a/src/cuchaz/enigma/mapping/ClassMapping.java b/src/cuchaz/enigma/mapping/ClassMapping.java
index 07fed32..ac70df0 100644
--- a/src/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/cuchaz/enigma/mapping/ClassMapping.java
@@ -243,6 +243,15 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
                 }
         }
         
+        public void setFieldObfName(String oldObfName, Type obfType, String newObfName) {
+                assert(newObfName != null);
+                FieldMapping fieldMapping = m_fieldsByObf.remove(getFieldKey(oldObfName, obfType));
+                assert(fieldMapping != null);
+                fieldMapping.setObfName(newObfName);
+                boolean obfWasAdded = m_fieldsByObf.put(getFieldKey(newObfName, obfType), fieldMapping) == null;
+                assert(obfWasAdded);
+        }
+        
         
         //// METHODS ////////
         
@@ -319,6 +328,15 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
                 }
         }
         
+        public void setMethodObfName(String oldObfName, Signature obfSignature, String newObfName) {
+                assert(newObfName != null);
+                MethodMapping methodMapping = m_methodsByObf.remove(getMethodKey(oldObfName, obfSignature));
+                assert(methodMapping != null);
+                methodMapping.setObfName(newObfName);
+                boolean obfWasAdded = m_methodsByObf.put(getMethodKey(newObfName, obfSignature), methodMapping) == null;
+                assert(obfWasAdded);
+        }
+        
         //// ARGUMENTS ////////
         
         public void setArgumentName(String obfMethodName, Signature obfMethodSignature, int argumentIndex, String argumentName) {
diff --git a/src/cuchaz/enigma/mapping/FieldMapping.java b/src/cuchaz/enigma/mapping/FieldMapping.java
index 1289351..3aa9e69 100644
--- a/src/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/cuchaz/enigma/mapping/FieldMapping.java
@@ -36,6 +36,10 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping>, Mem
                 return m_obfName;
         }
         
+        public void setObfName(String val) {
+                m_obfName = NameValidator.validateFieldName(val);
+        }
+        
         public String getDeobfName() {
                 return m_deobfName;
         }
diff --git a/src/cuchaz/enigma/mapping/MethodMapping.java b/src/cuchaz/enigma/mapping/MethodMapping.java
index bf6dacc..a67e352 100644
--- a/src/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/cuchaz/enigma/mapping/MethodMapping.java
@@ -56,6 +56,10 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping>, M
                 return m_obfName;
         }
         
+        public void setObfName(String val) {
+                m_obfName = NameValidator.validateMethodName(val);
+        }
+        
         public String getDeobfName() {
                 return m_deobfName;
         }