diff options
| author |  Cuchaz | 2015-09-09 17:04:37 -0400 |
|---|---|---|
| committer | Cuchaz | 2015-09-09 17:04:37 -0400 |
| commit | b0485f3fa10c52a57bd575ce3fe22a0b0742e1c1 (patch) | |
| tree | a5965e05672b3038644d12a6f749b07f7d735444 | |
| parent | tweaks to matcher for 1.9 snapshot (diff) | |
| download | enigma-b0485f3fa10c52a57bd575ce3fe22a0b0742e1c1.tar.gz enigma-b0485f3fa10c52a57bd575ce3fe22a0b0742e1c1.tar.xz enigma-b0485f3fa10c52a57bd575ce3fe22a0b0742e1c1.zip | |
fix assembling nested inner class names
| -rw-r--r-- | src/cuchaz/enigma/bytecode/ClassRenamer.java | 6 |
1 files 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 { | |||
| 450 | NestedClassType nestedType = (NestedClassType)type; | 450 | NestedClassType nestedType = (NestedClassType)type; |
| 451 | 451 | ||
| 452 | // translate the name | 452 | // translate the name |
| 453 | String name = nestedType.getName(); | 453 | String name = getClassName(type); |
| 454 | String newName = map.get(getClassName(type)); | 454 | String newName = map.get(name); |
| 455 | if (newName != null) { | 455 | if (newName != null) { |
| 456 | name = new ClassEntry(newName).getInnermostClassName(); | 456 | name = new ClassEntry(newName).getInnermostClassName(); |
| 457 | } | 457 | } |
| @@ -479,7 +479,7 @@ public class ClassRenamer { | |||
| 479 | private static String getClassName(ClassType type) { | 479 | private static String getClassName(ClassType type) { |
| 480 | if (type instanceof NestedClassType) { | 480 | if (type instanceof NestedClassType) { |
| 481 | NestedClassType nestedType = (NestedClassType)type; | 481 | NestedClassType nestedType = (NestedClassType)type; |
| 482 | return getClassName(nestedType.getDeclaringClass()) + "$" + Descriptor.toJvmName(type.getName()); | 482 | return getClassName(nestedType.getDeclaringClass()) + "$" + Descriptor.toJvmName(type.getName().replace('.', '$')); |
| 483 | } else { | 483 | } else { |
| 484 | return Descriptor.toJvmName(type.getName()); | 484 | return Descriptor.toJvmName(type.getName()); |
| 485 | } | 485 | } |