summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/Deobfuscator.java
diff options
context:
space:
mode:
authorGravatar jeff2015-03-16 19:22:22 -0400
committerGravatar jeff2015-03-16 19:22:22 -0400
commit5e3743a0aca3529eacf9be400c8b8d7547f66e7f (patch)
treeea601747547f78e1b83ab828650932126440e221 /src/cuchaz/enigma/Deobfuscator.java
parentupdate to new javassist version to (hopefully) get bug fixes (diff)
downloadenigma-fork-5e3743a0aca3529eacf9be400c8b8d7547f66e7f.tar.gz
enigma-fork-5e3743a0aca3529eacf9be400c8b8d7547f66e7f.tar.xz
enigma-fork-5e3743a0aca3529eacf9be400c8b8d7547f66e7f.zip
started adding minimal support for generics
fixed mark-as-deobfuscated issue
Diffstat (limited to 'src/cuchaz/enigma/Deobfuscator.java')
-rw-r--r--src/cuchaz/enigma/Deobfuscator.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/cuchaz/enigma/Deobfuscator.java b/src/cuchaz/enigma/Deobfuscator.java
index 5a23ce5..b63f163 100644
--- a/src/cuchaz/enigma/Deobfuscator.java
+++ b/src/cuchaz/enigma/Deobfuscator.java
@@ -439,12 +439,9 @@ public class Deobfuscator {
439 Translator translator = getTranslator(TranslationDirection.Deobfuscating); 439 Translator translator = getTranslator(TranslationDirection.Deobfuscating);
440 if (obfEntry instanceof ClassEntry) { 440 if (obfEntry instanceof ClassEntry) {
441 ClassEntry obfClass = (ClassEntry)obfEntry; 441 ClassEntry obfClass = (ClassEntry)obfEntry;
442 ClassEntry translated = translator.translateEntry(obfClass); 442 List<ClassMapping> mappingChain = m_mappings.getClassMappingChain(obfClass);
443 if (obfClass.isInnerClass()) { 443 ClassMapping classMapping = mappingChain.get(mappingChain.size() - 1);
444 return !obfClass.getInnermostClassName().equals(translated.getInnermostClassName()); 444 return classMapping != null && classMapping.getDeobfName() != null;
445 } else {
446 return !obfClass.equals(translated);
447 }
448 } else if (obfEntry instanceof FieldEntry) { 445 } else if (obfEntry instanceof FieldEntry) {
449 return translator.translate((FieldEntry)obfEntry) != null; 446 return translator.translate((FieldEntry)obfEntry) != null;
450 } else if (obfEntry instanceof MethodEntry) { 447 } else if (obfEntry instanceof MethodEntry) {