added stable save order for mappings to hopefully help with merging

added color-coding for source identifiers
redesigned rename GUI
customized editor pane, added popup menu
finished name validation
added last-chance save on window close

1 files changed, 9 insertions, 3 deletions

diff --git a/src/cuchaz/enigma/mapping/MethodMapping.java b/src/cuchaz/enigma/mapping/MethodMapping.java
index 1cdc38a..7857ea7 100644
--- a/src/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/cuchaz/enigma/mapping/MethodMapping.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.TreeMap;
 
-public class MethodMapping implements Serializable
+public class MethodMapping implements Serializable, Comparable<MethodMapping>
 {
         private static final long serialVersionUID = -4409570216084263978L;
         
@@ -28,7 +28,7 @@ public class MethodMapping implements Serializable
         public MethodMapping( String obfName, String deobfName, String obfSignature, String deobfSignature )
         {
                 m_obfName = obfName;
-                m_deobfName = deobfName;
+                m_deobfName = NameValidator.validateMethodName( deobfName );
                 m_obfSignature = obfSignature;
                 m_deobfSignature = deobfSignature;
                 m_arguments = new TreeMap<Integer,ArgumentMapping>();
@@ -45,7 +45,7 @@ public class MethodMapping implements Serializable
         }
         public void setDeobfName( String val )
         {
-                m_deobfName = val;
+                m_deobfName = NameValidator.validateMethodName( val );
         }
         
         public String getObfSignature( )
@@ -133,4 +133,10 @@ public class MethodMapping implements Serializable
                 }
                 return buf.toString();
         }
+        
+        @Override
+        public int compareTo( MethodMapping other )
+        {
+                return m_obfName.compareTo( other.m_obfName );
+        }
 }