summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/Deobfuscator.java
diff options
context:
space:
mode:
authorGravatar jeff2014-09-21 23:21:34 -0400
committerGravatar jeff2014-09-21 23:21:34 -0400
commit24ed3dc06bc133e4f718acc4a691e905b081fb11 (patch)
treee4a73d03f74bb7125216e351eb673809f89a00c3 /src/cuchaz/enigma/Deobfuscator.java
parentimproved inner/anonymous class detection (diff)
downloadenigma-fork-24ed3dc06bc133e4f718acc4a691e905b081fb11.tar.gz
enigma-fork-24ed3dc06bc133e4f718acc4a691e905b081fb11.tar.xz
enigma-fork-24ed3dc06bc133e4f718acc4a691e905b081fb11.zip
fixed bugs with anonymous/inner classes
Diffstat (limited to 'src/cuchaz/enigma/Deobfuscator.java')
-rw-r--r--src/cuchaz/enigma/Deobfuscator.java16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/cuchaz/enigma/Deobfuscator.java b/src/cuchaz/enigma/Deobfuscator.java
index 1d6f02c..9c84532 100644
--- a/src/cuchaz/enigma/Deobfuscator.java
+++ b/src/cuchaz/enigma/Deobfuscator.java
@@ -232,7 +232,7 @@ public class Deobfuscator
232 sourceTree.acceptVisitor( new SourceIndexVisitor(), index ); 232 sourceTree.acceptVisitor( new SourceIndexVisitor(), index );
233 233
234 // DEBUG 234 // DEBUG
235 //root.acceptVisitor( new TreeDumpVisitor( new File( "tree.txt" ) ), null ); 235 //sourceTree.acceptVisitor( new TreeDumpVisitor( new File( "tree.txt" ) ), null );
236 236
237 /* DEBUG 237 /* DEBUG
238 for( Token token : index.referenceTokens() ) 238 for( Token token : index.referenceTokens() )
@@ -420,19 +420,7 @@ public class Deobfuscator
420 { 420 {
421 if( obfEntry instanceof ClassEntry ) 421 if( obfEntry instanceof ClassEntry )
422 { 422 {
423 ClassEntry obfClassEntry = (ClassEntry)obfEntry; 423 return m_jarIndex.getObfClassEntries().contains( obfEntry );
424 if( obfClassEntry.isInnerClass() )
425 {
426 // both classes must be in the list
427 return m_jarIndex.getObfClassEntries().contains( obfClassEntry.getOuterClassEntry() )
428 && m_jarIndex.getObfClassEntries().contains( obfClassEntry.getInnerClassName() );
429 // TODO: make sure this works for the inner class!!
430 }
431 else
432 {
433 // class must be in the list
434 return m_jarIndex.getObfClassEntries().contains( obfEntry );
435 }
436 } 424 }
437 else 425 else
438 { 426 {