1.1 --- a/src/share/classes/com/sun/tools/javap/ClassWriter.java Thu Mar 18 18:52:44 2010 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javap/ClassWriter.java Tue Mar 23 18:05:54 2010 -0700
1.3 @@ -225,15 +225,15 @@
1.4 writeModifiers(flags.getFieldModifiers());
1.5 Signature_attribute sigAttr = getSignature(f.attributes);
1.6 if (sigAttr == null)
1.7 - print(getFieldType(f.descriptor));
1.8 + print(getJavaFieldType(f.descriptor));
1.9 else {
1.10 try {
1.11 Type t = sigAttr.getParsedSignature().getType(constant_pool);
1.12 - print(t);
1.13 + print(getJavaName(t.toString()));
1.14 } catch (ConstantPoolException e) {
1.15 // report error?
1.16 // fall back on non-generic descriptor
1.17 - print(getFieldType(f.descriptor));
1.18 + print(getJavaFieldType(f.descriptor));
1.19 }
1.20 }
1.21 print(" ");
1.22 @@ -314,14 +314,14 @@
1.23 }
1.24 if (getName(m).equals("<init>")) {
1.25 print(getJavaName(classFile));
1.26 - print(getParameterTypes(d, flags));
1.27 + print(getJavaParameterTypes(d, flags));
1.28 } else if (getName(m).equals("<clinit>")) {
1.29 print("{}");
1.30 } else {
1.31 - print(getReturnType(d));
1.32 + print(getJavaReturnType(d));
1.33 print(" ");
1.34 print(getName(m));
1.35 - print(getParameterTypes(d, flags));
1.36 + print(getJavaParameterTypes(d, flags));
1.37 }
1.38
1.39 Attribute e_attr = m.attributes.get(Attribute.Exceptions);
1.40 @@ -460,9 +460,9 @@
1.41 }
1.42 }
1.43
1.44 - String getFieldType(Descriptor d) {
1.45 + String getJavaFieldType(Descriptor d) {
1.46 try {
1.47 - return d.getFieldType(constant_pool);
1.48 + return getJavaName(d.getFieldType(constant_pool));
1.49 } catch (ConstantPoolException e) {
1.50 return report(e);
1.51 } catch (DescriptorException e) {
1.52 @@ -470,9 +470,9 @@
1.53 }
1.54 }
1.55
1.56 - String getReturnType(Descriptor d) {
1.57 + String getJavaReturnType(Descriptor d) {
1.58 try {
1.59 - return d.getReturnType(constant_pool);
1.60 + return getJavaName(d.getReturnType(constant_pool));
1.61 } catch (ConstantPoolException e) {
1.62 return report(e);
1.63 } catch (DescriptorException e) {
1.64 @@ -480,9 +480,9 @@
1.65 }
1.66 }
1.67
1.68 - String getParameterTypes(Descriptor d, AccessFlags flags) {
1.69 + String getJavaParameterTypes(Descriptor d, AccessFlags flags) {
1.70 try {
1.71 - return adjustVarargs(flags, d.getParameterTypes(constant_pool));
1.72 + return getJavaName(adjustVarargs(flags, d.getParameterTypes(constant_pool)));
1.73 } catch (ConstantPoolException e) {
1.74 return report(e);
1.75 } catch (DescriptorException e) {
