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, 8 insertions, 23 deletions

diff --git a/src/cuchaz/enigma/ClassFile.java b/src/cuchaz/enigma/ClassFile.java
index c3c72a4..613b379 100644
--- a/src/cuchaz/enigma/ClassFile.java
+++ b/src/cuchaz/enigma/ClassFile.java
@@ -13,39 +13,24 @@ package cuchaz.enigma;
 
 public class ClassFile
 {
-        private String m_obfName;
-        private String m_deobfName;
+        private String m_name;
         
-        public ClassFile( String obfName )
+        public ClassFile( String name )
         {
-                m_obfName = obfName;
-        }
-        
-        public String getName( )
-        {
-                if( m_deobfName != null )
+                if( name.indexOf( '.' ) >= 0 )
                 {
-                        return m_deobfName;
+                        throw new IllegalArgumentException( "Class name should be in JVM format!" );
                 }
-                return m_obfName;
-        }
-        
-        public String getObfName( )
-        {
-                return m_obfName;
+                m_name = name;
         }
         
-        public String getDeobfName( )
-        {
-                return m_deobfName;
-        }
-        public void setDeobfName( String val )
+        public String getName( )
         {
-                m_deobfName = val;
+                return m_name;
         }
         
         public String getPath( )
         {
-                return m_deobfName.replace( ".", "/" ) + ".class";
+                return m_name.replace( ".", "/" ) + ".class";
         }
 }