From b0485f3fa10c52a57bd575ce3fe22a0b0742e1c1 Mon Sep 17 00:00:00 2001 From: Cuchaz Date: Wed, 9 Sep 2015 17:04:37 -0400 Subject: fix assembling nested inner class names --- src/cuchaz/enigma/bytecode/ClassRenamer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cuchaz/enigma/bytecode/ClassRenamer.java b/src/cuchaz/enigma/bytecode/ClassRenamer.java index 4d95f30e..509877a4 100644 --- a/src/cuchaz/enigma/bytecode/ClassRenamer.java +++ b/src/cuchaz/enigma/bytecode/ClassRenamer.java @@ -450,8 +450,8 @@ public class ClassRenamer { NestedClassType nestedType = (NestedClassType)type; // translate the name - String name = nestedType.getName(); - String newName = map.get(getClassName(type)); + String name = getClassName(type); + String newName = map.get(name); if (newName != null) { name = new ClassEntry(newName).getInnermostClassName(); } @@ -479,7 +479,7 @@ public class ClassRenamer { private static String getClassName(ClassType type) { if (type instanceof NestedClassType) { NestedClassType nestedType = (NestedClassType)type; - return getClassName(nestedType.getDeclaringClass()) + "$" + Descriptor.toJvmName(type.getName()); + return getClassName(nestedType.getDeclaringClass()) + "$" + Descriptor.toJvmName(type.getName().replace('.', '$')); } else { return Descriptor.toJvmName(type.getName()); } -- cgit v1.2.3