added gui/cli loading of jars/mappings

gui can save mappings too

1 files changed, 23 insertions, 8 deletions

diff --git a/src/cuchaz/enigma/Deobfuscator.java b/src/cuchaz/enigma/Deobfuscator.java
index b1abd9e..bc7065f 100644
--- a/src/cuchaz/enigma/Deobfuscator.java
+++ b/src/cuchaz/enigma/Deobfuscator.java
@@ -83,18 +83,13 @@ public class Deobfuscator
                         Util.closeQuietly( jarIn );
                 }
                 
-                // init mappings
-                m_mappings = new TranslationMappings( m_ancestries );
-                
                 // config the decompiler
                 m_settings = DecompilerSettings.javaDefaults();
-                m_settings.setTypeLoader( new TranslatingTypeLoader(
-                        m_jar,
-                        m_mappings.getTranslator( TranslationDirection.Deobfuscating ),
-                        m_mappings.getTranslator( TranslationDirection.Obfuscating )
-                ) );
                 m_settings.setForceExplicitImports( true );
                 m_settings.setShowSyntheticMembers( true );
+                
+                // init mappings
+                setMappings( new TranslationMappings( m_ancestries ) );
         }
         
         public String getJarName( )
@@ -102,6 +97,26 @@ public class Deobfuscator
                 return m_file.getName();
         }
         
+        public TranslationMappings getMappings( )
+        {
+                return m_mappings;
+        }
+        public void setMappings( TranslationMappings val )
+        {
+                if( val == null )
+                {
+                        val = new TranslationMappings( m_ancestries );
+                }
+                m_mappings = val;
+                
+                // update decompiler options
+                m_settings.setTypeLoader( new TranslatingTypeLoader(
+                        m_jar,
+                        m_mappings.getTranslator( TranslationDirection.Deobfuscating ),
+                        m_mappings.getTranslator( TranslationDirection.Obfuscating )
+                ) );
+        }
+        
         public List<ClassFile> getObfuscatedClasses( )
         {
                 List<ClassFile> classes = new ArrayList<ClassFile>();