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/FieldMapping.java b/src/cuchaz/enigma/mapping/FieldMapping.java
index 618f45c..ae0855a 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
+public class FieldMapping implements Serializable, Comparable<FieldMapping>
 {
         private static final long serialVersionUID = 8610742471440861315L;
         
@@ -22,7 +22,7 @@ public class FieldMapping implements Serializable
         public FieldMapping( String obfName, String deobfName )
         {
                 m_obfName = obfName;
-                m_deobfName = deobfName;
+                m_deobfName = NameValidator.validateFieldName( deobfName );
         }
 
         public String getObfName( )
@@ -36,6 +36,12 @@ public class FieldMapping implements Serializable
         }
         public void setDeobfName( String val )
         {
-                m_deobfName = val;
+                m_deobfName = NameValidator.validateFieldName( val );
+        }
+        
+        @Override
+        public int compareTo( FieldMapping other )
+        {
+                return m_obfName.compareTo( other.m_obfName );
         }
 }