fixed bug with save mappings menu

gui shows deobfuscated classes list now
working on name validation/sanitization

3 files changed, 76 insertions, 10 deletions

diff --git a/src/cuchaz/enigma/gui/ObfuscatedClassListCellRenderer.java b/src/cuchaz/enigma/gui/ClassListCellRenderer.java
index 0badb3b..302f140 100644
--- a/src/cuchaz/enigma/gui/ObfuscatedClassListCellRenderer.java
+++ b/src/cuchaz/enigma/gui/ClassListCellRenderer.java
@@ -19,11 +19,11 @@ import javax.swing.ListCellRenderer;
 
 import cuchaz.enigma.ClassFile;
 
-public class ObfuscatedClassListCellRenderer implements ListCellRenderer<ClassFile>
+public class ClassListCellRenderer implements ListCellRenderer<ClassFile>
 {
         private DefaultListCellRenderer m_defaultRenderer;
         
-        public ObfuscatedClassListCellRenderer( )
+        public ClassListCellRenderer( )
         {
                 m_defaultRenderer = new DefaultListCellRenderer();
         }
diff --git a/src/cuchaz/enigma/gui/Gui.java b/src/cuchaz/enigma/gui/Gui.java
index a86ff9b..d448dc2 100644
--- a/src/cuchaz/enigma/gui/Gui.java
+++ b/src/cuchaz/enigma/gui/Gui.java
@@ -21,6 +21,8 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Vector;
 
@@ -58,6 +60,25 @@ import cuchaz.enigma.mapping.MethodEntry;
 
 public class Gui
 {
+        private static Comparator<ClassFile> m_obfuscatedClassSorter;
+        
+        static
+        {
+                m_obfuscatedClassSorter = new Comparator<ClassFile>( )
+                {
+                        @Override
+                        public int compare( ClassFile a, ClassFile b )
+                        {
+                                if( a.getName().length() != b.getName().length() )
+                                {
+                                        return a.getName().length() - b.getName().length();
+                                }
+                                
+                                return a.getName().compareTo( b.getName() );
+                        }
+                };
+        }
+        
         private GuiController m_controller;
         
         // controls
@@ -101,7 +122,7 @@ public class Gui
                 m_obfClasses = new JList<ClassFile>();
                 m_obfClasses.setSelectionMode( ListSelectionModel.SINGLE_SELECTION );
                 m_obfClasses.setLayoutOrientation( JList.VERTICAL );
-                m_obfClasses.setCellRenderer( new ObfuscatedClassListCellRenderer() );
+                m_obfClasses.setCellRenderer( new ClassListCellRenderer() );
                 m_obfClasses.addMouseListener( new MouseAdapter()
                 {
                         public void mouseClicked( MouseEvent event )
@@ -124,8 +145,23 @@ public class Gui
                 
                 // init deobfuscated classes list
                 m_deobfClasses = new JList<ClassFile>();
-                m_obfClasses.setSelectionMode( ListSelectionModel.SINGLE_SELECTION );
-                m_obfClasses.setLayoutOrientation( JList.VERTICAL );
+                m_deobfClasses.setSelectionMode( ListSelectionModel.SINGLE_SELECTION );
+                m_deobfClasses.setLayoutOrientation( JList.VERTICAL );
+                m_deobfClasses.setCellRenderer( new ClassListCellRenderer() );
+                m_deobfClasses.addMouseListener( new MouseAdapter()
+                {
+                        public void mouseClicked( MouseEvent event )
+                        {
+                                if( event.getClickCount() == 2 )
+                                {
+                                        ClassFile selected = m_deobfClasses.getSelectedValue();
+                                        if( selected != null )
+                                        {
+                                                m_controller.deobfuscateClass( selected );
+                                        }
+                                }
+                        }
+                } );
                 JScrollPane deobfScroller = new JScrollPane( m_deobfClasses );
                 JPanel deobfPanel = new JPanel();
                 deobfPanel.setLayout( new BorderLayout() );
@@ -248,7 +284,6 @@ public class Gui
                                                         try
                                                         {
                                                                 m_controller.openMappings( m_mappingFileChooser.getSelectedFile() );
-                                                                m_saveMappingsMenu.setEnabled( true );
                                                         }
                                                         catch( IOException ex )
                                                         {
@@ -383,7 +418,9 @@ public class Gui
         {
                 if( classes != null )
                 {
-                        m_obfClasses.setListData( new Vector<ClassFile>( classes ) );
+                        Vector<ClassFile> sortedClasses = new Vector<ClassFile>( classes );
+                        Collections.sort( sortedClasses, m_obfuscatedClassSorter );
+                        m_obfClasses.setListData( sortedClasses );
                 }
                 else
                 {
@@ -391,6 +428,23 @@ public class Gui
                 }
         }
         
+        public void setDeobfClasses( List<ClassFile> classes )
+        {
+                if( classes != null )
+                {
+                        m_deobfClasses.setListData( new Vector<ClassFile>( classes ) );
+                }
+                else
+                {
+                        m_deobfClasses.setListData( new Vector<ClassFile>() );
+                }
+        }
+        
+        public void setMappingsLoaded( boolean isLoaded )
+        {
+                m_saveMappingsMenu.setEnabled( isLoaded );
+        }
+        
         public void setSource( String source )
         {
                 setSource( source, null );
diff --git a/src/cuchaz/enigma/gui/GuiController.java b/src/cuchaz/enigma/gui/GuiController.java
index fb22b96..ce1c31b 100644
--- a/src/cuchaz/enigma/gui/GuiController.java
+++ b/src/cuchaz/enigma/gui/GuiController.java
@@ -14,6 +14,8 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import cuchaz.enigma.ClassFile;
 import cuchaz.enigma.Deobfuscator;
@@ -45,7 +47,7 @@ public class GuiController
         {
                 m_deobfuscator = new Deobfuscator( file );
                 m_gui.onOpenJar( m_deobfuscator.getJarName() );
-                m_gui.setObfClasses( m_deobfuscator.getObfuscatedClasses() );
+                refreshClasses();
         }
         
         public void closeJar( )
@@ -60,8 +62,8 @@ public class GuiController
                 FileReader in = new FileReader( file );
                 m_deobfuscator.setMappings( new MappingsReader().read( in ) );
                 in.close();
-                // TEMP
-                System.out.println( m_deobfuscator.getMappings() );
+                m_gui.setMappingsLoaded( true );
+                refreshClasses();
                 refreshOpenFiles();
         }
 
@@ -76,6 +78,7 @@ public class GuiController
         public void closeMappings( )
         {
                 m_deobfuscator.setMappings( null );
+                m_gui.setMappingsLoaded( false );
                 refreshOpenFiles();
         }
         
@@ -119,6 +122,15 @@ public class GuiController
                 refreshOpenFiles();
         }
         
+        private void refreshClasses( )
+        {
+                List<ClassFile> obfClasses = new ArrayList<ClassFile>();
+                List<ClassFile> deobfClasses = new ArrayList<ClassFile>();
+                m_deobfuscator.getSortedClasses( obfClasses, deobfClasses );
+                m_gui.setObfClasses( obfClasses );
+                m_gui.setDeobfClasses( deobfClasses );
+        }
+        
         private void refreshOpenFiles( )
         {
                 if( m_currentFile != null )