From a146283291d5529eb9363b2fbc6fd5e643dee85a Mon Sep 17 00:00:00 2001 From: jeff Date: Mon, 1 Sep 2014 20:40:11 -0400 Subject: made obfuscated/deobfuscated class selector a bit easier to use --- src/cuchaz/enigma/Deobfuscator.java | 10 +++++----- 1 file changed, 5 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 9a78f38..49aa1ff 100644 --- a/src/cuchaz/enigma/Deobfuscator.java +++ b/src/cuchaz/enigma/Deobfuscator.java @@ -151,12 +151,12 @@ public class Deobfuscator return m_mappings.getTranslator( m_jarIndex.getAncestries(), direction ); } - public void getSeparatedClasses( List obfClasses, List deobfClasses ) + public void getSeparatedClasses( List obfClasses, List deobfClasses ) { for( ClassEntry obfClassEntry : m_jarIndex.getObfClassEntries() ) { // skip inner classes - if( m_jarIndex.getOuterClass( obfClassEntry.getName() ) != null ) + if( obfClassEntry.isInnerClass() ) { continue; } @@ -166,17 +166,17 @@ public class Deobfuscator if( !deobfClassEntry.equals( obfClassEntry ) ) { // if the class has a mapping, clearly it's deobfuscated - deobfClasses.add( deobfClassEntry.getName() ); + deobfClasses.add( deobfClassEntry ); } else if( !obfClassEntry.getPackageName().equals( Constants.NonePackage ) ) { // also call it deobufscated if it's not in the none package - deobfClasses.add( obfClassEntry.getName() ); + deobfClasses.add( obfClassEntry ); } else { // otherwise, assume it's still obfuscated - obfClasses.add( obfClassEntry.getName() ); + obfClasses.add( obfClassEntry ); } } } -- cgit v1.2.3