diff options
Diffstat (limited to 'src/cuchaz/enigma/Deobfuscator.java')
| -rw-r--r-- | src/cuchaz/enigma/Deobfuscator.java | 16 |
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 | { |