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, 2 insertions, 2 deletions

diff --git a/src/cuchaz/enigma/analysis/SourceIndex.java b/src/cuchaz/enigma/analysis/SourceIndex.java
index ee92d1e..61c833c 100644
--- a/src/cuchaz/enigma/analysis/SourceIndex.java
+++ b/src/cuchaz/enigma/analysis/SourceIndex.java
@@ -52,7 +52,7 @@ public class SourceIndex implements Iterable<Map.Entry<Entry,Token>>
                 return m_tokenToEntry.get( token );
         }
         
-        public Entry getEntry( int pos )
+        public Map.Entry<Entry,Token> getEntry( int pos )
         {
                 // linear search is fast enough for now
                 for( Map.Entry<Entry,Token> entry : this )
@@ -60,7 +60,7 @@ public class SourceIndex implements Iterable<Map.Entry<Entry,Token>>
                         Token token = entry.getValue();
                         if( pos >= token.start && pos <= token.end() )
                         {
-                                return entry.getKey();
+                                return entry;
                         }
                 }
                 return null;