ArgType refactoring, add generic parsing

src/main/java/jadx/codegen/InsnGen.java

@@ -94,10 +94,18 @@ public class InsnGen {
 	}
 
 	public String declareVar(RegisterArg arg) throws CodegenException {
-		String type = TypeGen.translate(mgen.getClassGen(), arg.getType());
-		String generic = arg.getType().getGeneric();
-		if (generic != null)
-			type += " /* " + generic + " */";
+		String type = useType(arg.getType());
+		ArgType[] generics = arg.getType().getGenericTypes();
+		if (generics != null) {
+			StringBuilder sb = new StringBuilder();
+			sb.append(type);
+			sb.append("/*<");
+			for (ArgType gt : generics) {
+				sb.append(useType(gt));
+			}
+			sb.append(">*/");
+			type = sb.toString();
+		}
 		return type + " " + arg(arg);
 	}
 

src/main/java/jadx/dex/info/LocalVarInfo.java

@@ -28,7 +28,7 @@ public class LocalVarInfo extends RegisterArg {
 
 	private void init(String name, ArgType type, String sign) {
 		if (sign != null) {
-			type.setGeneric(sign);
+			type = ArgType.generic(type.getObject(), sign);
 		}
 		TypedVar tv = new TypedVar(type);
 		tv.setName(name);

src/main/java/jadx/dex/instructions/args/PrimitiveType.java

@@ -45,6 +45,6 @@ public enum PrimitiveType {
 
 	@Override
 	public String toString() {
-		return this.name().toLowerCase();
+		return longName;
 	}
 }

src/main/java/jadx/dex/nodes/MethodNode.java

@@ -109,8 +109,6 @@ public class MethodNode extends AttrNode implements ILoadable {
 			return;
 
 		if (instructions != null) instructions.clear();
-		// if (blocks != null) blocks.clear();
-		// if (exitBlocks != null) exitBlocks.clear();
 		blocks = null;
 		exitBlocks = null;
 		if (exceptionHandlers != null) exceptionHandlers.clear();