From ecfda21f3db9e62e3acf074e9842e92ace4cb3ab Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 17 Mar 2015 20:01:55 -0400 Subject: parsing generic signatures is tricky. don't write custom code to do it. switching to library instead --- src/cuchaz/enigma/bytecode/ClassRenamer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/cuchaz/enigma/bytecode/ClassRenamer.java') diff --git a/src/cuchaz/enigma/bytecode/ClassRenamer.java b/src/cuchaz/enigma/bytecode/ClassRenamer.java index d88daa5..d7acd30 100644 --- a/src/cuchaz/enigma/bytecode/ClassRenamer.java +++ b/src/cuchaz/enigma/bytecode/ClassRenamer.java @@ -34,7 +34,6 @@ import javassist.bytecode.SignatureAttribute.MethodSignature; import javassist.bytecode.SignatureAttribute.ObjectType; import cuchaz.enigma.mapping.ClassEntry; import cuchaz.enigma.mapping.ClassNameReplacer; -import cuchaz.enigma.mapping.ParameterizedType; import cuchaz.enigma.mapping.Translator; import cuchaz.enigma.mapping.Type; @@ -103,8 +102,8 @@ public class ClassRenamer { } public String getFramed(String typeName) { - ParameterizedType type = new ParameterizedType(new Type(typeName)); - ParameterizedType renamedType = new ParameterizedType(type, m_replacer); + Type type = new Type(typeName); + Type renamedType = new Type(type, m_replacer); if (!type.equals(renamedType)) { return renamedType.toString(); } @@ -115,6 +114,7 @@ public class ClassRenamer { // we can deal with the ones that start with a class String signature = type.encode(); + /* if (signature.startsWith("L") || signature.startsWith("[")) { // TEMP: skip special characters for now @@ -134,10 +134,11 @@ public class ClassRenamer { // don't need to care about template names return null; } else { + */ // TEMP System.out.println("Skipping translating: " + signature); return null; - } + //} } } -- cgit v1.2.3