--- a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Tue Oct 15 22:15:35 2013 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Tue Oct 15 15:57:13 2013 -0700
@@ -260,24 +260,23 @@
@Override
public String visitAnnotatedType(AnnotatedType t, Locale locale) {
- if (t.typeAnnotations != null &&
- t.typeAnnotations.nonEmpty()) {
- if (t.underlyingType.hasTag(TypeTag.ARRAY)) {
+ if (t.getAnnotationMirrors().nonEmpty()) {
+ if (t.unannotatedType().hasTag(TypeTag.ARRAY)) {
StringBuilder res = new StringBuilder();
printBaseElementType(t, res, locale);
printBrackets(t, res, locale);
return res.toString();
- } else if (t.underlyingType.hasTag(TypeTag.CLASS) &&
- t.underlyingType.getEnclosingType() != Type.noType) {
- return visit(t.underlyingType.getEnclosingType(), locale) +
+ } else if (t.unannotatedType().hasTag(TypeTag.CLASS) &&
+ t.unannotatedType().getEnclosingType() != Type.noType) {
+ return visit(t.unannotatedType().getEnclosingType(), locale) +
". " +
- t.typeAnnotations +
- " " + className((ClassType)t.underlyingType, false, locale);
+ t.getAnnotationMirrors() +
+ " " + className((ClassType)t.unannotatedType(), false, locale);
} else {
- return t.typeAnnotations + " " + visit(t.underlyingType, locale);
+ return t.getAnnotationMirrors() + " " + visit(t.unannotatedType(), locale);
}
} else {
- return visit(t.underlyingType, locale);
+ return visit(t.unannotatedType(), locale);
}
}