From 0a53f722541ba14ac8c0baf45299fdfd8b054496 Mon Sep 17 00:00:00 2001
From: jeff
Date: Sun, 22 Mar 2015 14:25:09 -0400
Subject: don't forget to translate EnclosingMethod attributes

---
 src/cuchaz/enigma/bytecode/ClassTranslator.java | 28 +++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src/cuchaz/enigma/bytecode')

diff --git a/src/cuchaz/enigma/bytecode/ClassTranslator.java b/src/cuchaz/enigma/bytecode/ClassTranslator.java
index 7952577..32518d9 100644
--- a/src/cuchaz/enigma/bytecode/ClassTranslator.java
+++ b/src/cuchaz/enigma/bytecode/ClassTranslator.java
@@ -16,6 +16,7 @@ import javassist.CtField;
 import javassist.CtMethod;
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
+import javassist.bytecode.EnclosingMethodAttribute;
 import javassist.bytecode.SourceFileAttribute;
 import cuchaz.enigma.mapping.BehaviorEntry;
 import cuchaz.enigma.mapping.ClassEntry;
@@ -115,6 +116,33 @@ public class ClassTranslator {
 			}
 		}
 		
+		// translate the EnclosingMethod attribute
+		EnclosingMethodAttribute enclosingMethodAttr = (EnclosingMethodAttribute)c.getClassFile().getAttribute(EnclosingMethodAttribute.tag);
+		if (enclosingMethodAttr != null) {
+			
+			if (enclosingMethodAttr.methodIndex() == 0) {
+				BehaviorEntry obfBehaviorEntry = EntryFactory.getBehaviorEntry(Descriptor.toJvmName(enclosingMethodAttr.className()));
+				BehaviorEntry deobfBehaviorEntry = m_translator.translateEntry(obfBehaviorEntry);
+				c.getClassFile().addAttribute(new EnclosingMethodAttribute(
+					constants,
+					deobfBehaviorEntry.getClassName()
+				));
+			} else {
+				BehaviorEntry obfBehaviorEntry = EntryFactory.getBehaviorEntry(
+					Descriptor.toJvmName(enclosingMethodAttr.className()),
+					enclosingMethodAttr.methodName(),
+					enclosingMethodAttr.methodDescriptor()
+				);
+				BehaviorEntry deobfBehaviorEntry = m_translator.translateEntry(obfBehaviorEntry);
+				c.getClassFile().addAttribute(new EnclosingMethodAttribute(
+					constants,
+					deobfBehaviorEntry.getClassName(),
+					deobfBehaviorEntry.getName(),
+					deobfBehaviorEntry.getSignature().toString()
+				));
+			}
+		}
+		
 		// translate all the class names referenced in the code
 		// the above code only changed method/field/reference names and types, but not the rest of the class references
 		ClassRenamer.renameClasses(c, m_translator);
-- 
cgit v1.2.3