summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/gui/GuiController.java
diff options
context:
space:
mode:
authorGravatar jeff2014-07-31 22:27:26 -0400
committerGravatar jeff2014-07-31 22:27:26 -0400
commitfaae0a6514c2565a10f9a62dd18c5d79fbbe4156 (patch)
tree9369f3b920919dd4a4bb2aa449c3dc467d4a43ea /src/cuchaz/enigma/gui/GuiController.java
parentswitched to line-by-line mergable, human-readable file format for mappings (diff)
downloadenigma-fork-faae0a6514c2565a10f9a62dd18c5d79fbbe4156.tar.gz
enigma-fork-faae0a6514c2565a10f9a62dd18c5d79fbbe4156.tar.xz
enigma-fork-faae0a6514c2565a10f9a62dd18c5d79fbbe4156.zip
fixed bug with save mappings menu
gui shows deobfuscated classes list now working on name validation/sanitization
Diffstat (limited to 'src/cuchaz/enigma/gui/GuiController.java')
-rw-r--r--src/cuchaz/enigma/gui/GuiController.java18
1 files changed, 15 insertions, 3 deletions
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;
14import java.io.FileReader; 14import java.io.FileReader;
15import java.io.FileWriter; 15import java.io.FileWriter;
16import java.io.IOException; 16import java.io.IOException;
17import java.util.ArrayList;
18import java.util.List;
17 19
18import cuchaz.enigma.ClassFile; 20import cuchaz.enigma.ClassFile;
19import cuchaz.enigma.Deobfuscator; 21import cuchaz.enigma.Deobfuscator;
@@ -45,7 +47,7 @@ public class GuiController
45 { 47 {
46 m_deobfuscator = new Deobfuscator( file ); 48 m_deobfuscator = new Deobfuscator( file );
47 m_gui.onOpenJar( m_deobfuscator.getJarName() ); 49 m_gui.onOpenJar( m_deobfuscator.getJarName() );
48 m_gui.setObfClasses( m_deobfuscator.getObfuscatedClasses() ); 50 refreshClasses();
49 } 51 }
50 52
51 public void closeJar( ) 53 public void closeJar( )
@@ -60,8 +62,8 @@ public class GuiController
60 FileReader in = new FileReader( file ); 62 FileReader in = new FileReader( file );
61 m_deobfuscator.setMappings( new MappingsReader().read( in ) ); 63 m_deobfuscator.setMappings( new MappingsReader().read( in ) );
62 in.close(); 64 in.close();
63 // TEMP 65 m_gui.setMappingsLoaded( true );
64 System.out.println( m_deobfuscator.getMappings() ); 66 refreshClasses();
65 refreshOpenFiles(); 67 refreshOpenFiles();
66 } 68 }
67 69
@@ -76,6 +78,7 @@ public class GuiController
76 public void closeMappings( ) 78 public void closeMappings( )
77 { 79 {
78 m_deobfuscator.setMappings( null ); 80 m_deobfuscator.setMappings( null );
81 m_gui.setMappingsLoaded( false );
79 refreshOpenFiles(); 82 refreshOpenFiles();
80 } 83 }
81 84
@@ -119,6 +122,15 @@ public class GuiController
119 refreshOpenFiles(); 122 refreshOpenFiles();
120 } 123 }
121 124
125 private void refreshClasses( )
126 {
127 List<ClassFile> obfClasses = new ArrayList<ClassFile>();
128 List<ClassFile> deobfClasses = new ArrayList<ClassFile>();
129 m_deobfuscator.getSortedClasses( obfClasses, deobfClasses );
130 m_gui.setObfClasses( obfClasses );
131 m_gui.setDeobfClasses( deobfClasses );
132 }
133
122 private void refreshOpenFiles( ) 134 private void refreshOpenFiles( )
123 { 135 {
124 if( m_currentFile != null ) 136 if( m_currentFile != null )