1.1 --- a/src/share/classes/com/sun/tools/javap/ClassWriter.java Thu Oct 15 22:48:34 2009 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javap/ClassWriter.java Fri Oct 16 12:56:50 2009 -0700 1.3 @@ -179,10 +179,10 @@ 1.4 // The signature parser cannot disambiguate between a 1.5 // FieldType and a ClassSignatureType that only contains a superclass type. 1.6 if (t instanceof Type.ClassSigType) 1.7 - print(t); 1.8 + print(getJavaName(t.toString())); 1.9 else { 1.10 print(" extends "); 1.11 - print(t); 1.12 + print(getJavaName(t.toString())); 1.13 } 1.14 } catch (ConstantPoolException e) { 1.15 print(report(e)); 1.16 @@ -310,7 +310,7 @@ 1.17 1.18 writeModifiers(flags.getMethodModifiers()); 1.19 if (methodType != null) { 1.20 - writeListIfNotEmpty("<", methodType.typeArgTypes, "> "); 1.21 + writeListIfNotEmpty("<", methodType.typeParamTypes, "> "); 1.22 } 1.23 if (getName(m).equals("<init>")) { 1.24 print(getJavaName(classFile));