From 89c00557a7a91041e137528bf97b8e9c58101a8b Mon Sep 17 00:00:00 2001 From: Agaricus Date: Sat, 26 Jan 2013 00:05:22 -0800 Subject: [PATCH] Fix recent regression in remapping inner classes Broken in refactor in 3ff134311d76824e5ba362b359c532af1720662f The outer class name (before '$') should be used for mapClassName. --- src/main/java/net/md_5/specialsource/JarRemapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/md_5/specialsource/JarRemapper.java b/src/main/java/net/md_5/specialsource/JarRemapper.java index 066f364..71e2196 100644 --- a/src/main/java/net/md_5/specialsource/JarRemapper.java +++ b/src/main/java/net/md_5/specialsource/JarRemapper.java @@ -63,7 +63,7 @@ public class JarRemapper extends Remapper { public static String mapTypeName(String typeName, Map packageMap, Map classMap) { int index = typeName.indexOf('$'); String key = (index == -1) ? typeName : typeName.substring(0, index); - String mapped = mapClassName(typeName, packageMap, classMap); + String mapped = mapClassName(key, packageMap, classMap); return mapped != null ? mapped + (index == -1 ? "" : typeName.substring(index, typeName.length())) : typeName; }