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, 6 deletions

diff --git a/src/cuchaz/enigma/analysis/SourcedAst.java b/src/cuchaz/enigma/analysis/SourcedAst.java
index 52a3453..968c880 100644
--- a/src/cuchaz/enigma/analysis/SourcedAst.java
+++ b/src/cuchaz/enigma/analysis/SourcedAst.java
@@ -59,14 +59,17 @@ public class SourcedAst
                 }
                 
                 // index the self class using the package name
-                String packageName = Descriptor.toJvmName( m_tree.getPackageName().toString() );
-                for( Tree typeTree : m_tree.getTypeDecls() )
+                if( m_tree.getPackageName() != null )
                 {
-                        if( typeTree instanceof ClassTree )
+                        String packageName = Descriptor.toJvmName( m_tree.getPackageName().toString() );
+                        for( Tree typeTree : m_tree.getTypeDecls() )
                         {
-                                ClassTree classTree = (ClassTree)typeTree;
-                                String className = classTree.getSimpleName().toString();
-                                m_classNameIndex.put( className, packageName + "/" + className );
+                                if( typeTree instanceof ClassTree )
+                                {
+                                        ClassTree classTree = (ClassTree)typeTree;
+                                        String className = classTree.getSimpleName().toString();
+                                        m_classNameIndex.put( className, packageName + "/" + className );
+                                }
                         }
                 }
         }