summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/Deobfuscator.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/cuchaz/enigma/Deobfuscator.java')
-rw-r--r--src/cuchaz/enigma/Deobfuscator.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/cuchaz/enigma/Deobfuscator.java b/src/cuchaz/enigma/Deobfuscator.java
index 65e618a..2fceef1 100644
--- a/src/cuchaz/enigma/Deobfuscator.java
+++ b/src/cuchaz/enigma/Deobfuscator.java
@@ -100,11 +100,16 @@ public class Deobfuscator
100 // update decompiler options 100 // update decompiler options
101 m_settings.setTypeLoader( new TranslatingTypeLoader( 101 m_settings.setTypeLoader( new TranslatingTypeLoader(
102 m_jar, 102 m_jar,
103 m_mappings.getTranslator( m_ancestries, TranslationDirection.Obfuscating ), 103 getTranslator( TranslationDirection.Obfuscating ),
104 m_mappings.getTranslator( m_ancestries, TranslationDirection.Deobfuscating ) 104 getTranslator( TranslationDirection.Deobfuscating )
105 ) ); 105 ) );
106 } 106 }
107 107
108 public Translator getTranslator( TranslationDirection direction )
109 {
110 return m_mappings.getTranslator( m_ancestries, direction );
111 }
112
108 public void getSeparatedClasses( List<ClassFile> obfClasses, Map<ClassFile,String> deobfClasses ) 113 public void getSeparatedClasses( List<ClassFile> obfClasses, Map<ClassFile,String> deobfClasses )
109 { 114 {
110 Enumeration<JarEntry> entries = m_jar.entries(); 115 Enumeration<JarEntry> entries = m_jar.entries();
@@ -181,7 +186,7 @@ public class Deobfuscator
181 186
182 public Entry obfuscateEntry( Entry deobfEntry ) 187 public Entry obfuscateEntry( Entry deobfEntry )
183 { 188 {
184 Translator translator = m_mappings.getTranslator( m_ancestries, TranslationDirection.Obfuscating ); 189 Translator translator = getTranslator( TranslationDirection.Obfuscating );
185 if( deobfEntry instanceof ClassEntry ) 190 if( deobfEntry instanceof ClassEntry )
186 { 191 {
187 return translator.translateEntry( (ClassEntry)deobfEntry ); 192 return translator.translateEntry( (ClassEntry)deobfEntry );
@@ -206,7 +211,7 @@ public class Deobfuscator
206 211
207 public Entry deobfuscateEntry( Entry obfEntry ) 212 public Entry deobfuscateEntry( Entry obfEntry )
208 { 213 {
209 Translator translator = m_mappings.getTranslator( m_ancestries, TranslationDirection.Deobfuscating ); 214 Translator translator = getTranslator( TranslationDirection.Deobfuscating );
210 if( obfEntry instanceof ClassEntry ) 215 if( obfEntry instanceof ClassEntry )
211 { 216 {
212 return translator.translateEntry( (ClassEntry)obfEntry ); 217 return translator.translateEntry( (ClassEntry)obfEntry );
@@ -231,7 +236,7 @@ public class Deobfuscator
231 236
232 public boolean hasMapping( Entry obfEntry ) 237 public boolean hasMapping( Entry obfEntry )
233 { 238 {
234 Translator translator = m_mappings.getTranslator( m_ancestries, TranslationDirection.Deobfuscating ); 239 Translator translator = getTranslator( TranslationDirection.Deobfuscating );
235 if( obfEntry instanceof ClassEntry ) 240 if( obfEntry instanceof ClassEntry )
236 { 241 {
237 String deobfName = translator.translate( (ClassEntry)obfEntry ); 242 String deobfName = translator.translate( (ClassEntry)obfEntry );