From 75d462daee9c24e19e28b4e969f92ae83a026e7b Mon Sep 17 00:00:00 2001
From: jeff
Date: Wed, 6 Aug 2014 22:18:12 -0400
Subject: show deobfuscated names in class inheritance

---
 src/cuchaz/enigma/Deobfuscator.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/cuchaz/enigma/Deobfuscator.java')

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
 		// update decompiler options
 		m_settings.setTypeLoader( new TranslatingTypeLoader(
 			m_jar,
-			m_mappings.getTranslator( m_ancestries, TranslationDirection.Obfuscating ),
-			m_mappings.getTranslator( m_ancestries, TranslationDirection.Deobfuscating )
+			getTranslator( TranslationDirection.Obfuscating ),
+			getTranslator( TranslationDirection.Deobfuscating )
 		) );
 	}
 	
+	public Translator getTranslator( TranslationDirection direction )
+	{
+		return m_mappings.getTranslator( m_ancestries, direction );
+	}
+	
 	public void getSeparatedClasses( List<ClassFile> obfClasses, Map<ClassFile,String> deobfClasses )
 	{
 		Enumeration<JarEntry> entries = m_jar.entries();
@@ -181,7 +186,7 @@ public class Deobfuscator
 	
 	public Entry obfuscateEntry( Entry deobfEntry )
 	{
-		Translator translator = m_mappings.getTranslator( m_ancestries, TranslationDirection.Obfuscating );
+		Translator translator = getTranslator( TranslationDirection.Obfuscating );
 		if( deobfEntry instanceof ClassEntry )
 		{
 			return translator.translateEntry( (ClassEntry)deobfEntry );
@@ -206,7 +211,7 @@ public class Deobfuscator
 	
 	public Entry deobfuscateEntry( Entry obfEntry )
 	{
-		Translator translator = m_mappings.getTranslator( m_ancestries, TranslationDirection.Deobfuscating );
+		Translator translator = getTranslator( TranslationDirection.Deobfuscating );
 		if( obfEntry instanceof ClassEntry )
 		{
 			return translator.translateEntry( (ClassEntry)obfEntry );
@@ -231,7 +236,7 @@ public class Deobfuscator
 	
 	public boolean hasMapping( Entry obfEntry )
 	{
-		Translator translator = m_mappings.getTranslator( m_ancestries, TranslationDirection.Deobfuscating );
+		Translator translator = getTranslator( TranslationDirection.Deobfuscating );
 		if( obfEntry instanceof ClassEntry )
 		{
 			String deobfName = translator.translate( (ClassEntry)obfEntry );
-- 
cgit v1.2.3