Merge pull request #14 from LexManos/master
Fix remapping of inner classes with mappings.
This commit is contained in:
commit
4615bf5727
@ -90,11 +90,8 @@ public class JarRemapper extends CustomRemapper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String mapTypeName(String typeName, Map<String, String> packageMap, Map<String, String> classMap, String defaultIfUnmapped) {
|
public static String mapTypeName(String typeName, Map<String, String> packageMap, Map<String, String> classMap, String defaultIfUnmapped) {
|
||||||
int index = typeName.indexOf('$');
|
String mapped = mapClassName(typeName, packageMap, classMap);
|
||||||
String key = (index == -1) ? typeName : typeName.substring(0, index);
|
return mapped != null ? mapped : defaultIfUnmapped;
|
||||||
String mapped = mapClassName(key, packageMap, classMap);
|
|
||||||
|
|
||||||
return mapped != null ? mapped + (index == -1 ? "" : typeName.substring(index, typeName.length())) : defaultIfUnmapped;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -105,6 +102,15 @@ public class JarRemapper extends CustomRemapper {
|
|||||||
return classMap.get(className);
|
return classMap.get(className);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int index = className.lastIndexOf('$');
|
||||||
|
if (index != -1)
|
||||||
|
{
|
||||||
|
String outer = className.substring(0, index);
|
||||||
|
String mapped = mapClassName(outer, packageMap, classMap);
|
||||||
|
if (mapped == null) return null;
|
||||||
|
return mapped + className.substring(index);
|
||||||
|
}
|
||||||
|
|
||||||
if (packageMap != null) {
|
if (packageMap != null) {
|
||||||
Iterator<String> iter = packageMap.keySet().iterator();
|
Iterator<String> iter = packageMap.keySet().iterator();
|
||||||
while (iter.hasNext()) {
|
while (iter.hasNext()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user