From faae0a6514c2565a10f9a62dd18c5d79fbbe4156 Mon Sep 17 00:00:00 2001 From: jeff Date: Thu, 31 Jul 2014 22:27:26 -0400 Subject: fixed bug with save mappings menu gui shows deobfuscated classes list now working on name validation/sanitization --- src/cuchaz/enigma/gui/GuiController.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/cuchaz/enigma/gui/GuiController.java') 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 obfClasses = new ArrayList(); + List deobfClasses = new ArrayList(); + m_deobfuscator.getSortedClasses( obfClasses, deobfClasses ); + m_gui.setObfClasses( obfClasses ); + m_gui.setDeobfClasses( deobfClasses ); + } + private void refreshOpenFiles( ) { if( m_currentFile != null ) -- cgit v1.2.3