258 return visitType(t, locale); |
258 return visitType(t, locale); |
259 } |
259 } |
260 |
260 |
261 @Override |
261 @Override |
262 public String visitAnnotatedType(AnnotatedType t, Locale locale) { |
262 public String visitAnnotatedType(AnnotatedType t, Locale locale) { |
263 if (t.typeAnnotations != null && |
263 if (t.getAnnotationMirrors().nonEmpty()) { |
264 t.typeAnnotations.nonEmpty()) { |
264 if (t.unannotatedType().hasTag(TypeTag.ARRAY)) { |
265 if (t.underlyingType.hasTag(TypeTag.ARRAY)) { |
|
266 StringBuilder res = new StringBuilder(); |
265 StringBuilder res = new StringBuilder(); |
267 printBaseElementType(t, res, locale); |
266 printBaseElementType(t, res, locale); |
268 printBrackets(t, res, locale); |
267 printBrackets(t, res, locale); |
269 return res.toString(); |
268 return res.toString(); |
270 } else if (t.underlyingType.hasTag(TypeTag.CLASS) && |
269 } else if (t.unannotatedType().hasTag(TypeTag.CLASS) && |
271 t.underlyingType.getEnclosingType() != Type.noType) { |
270 t.unannotatedType().getEnclosingType() != Type.noType) { |
272 return visit(t.underlyingType.getEnclosingType(), locale) + |
271 return visit(t.unannotatedType().getEnclosingType(), locale) + |
273 ". " + |
272 ". " + |
274 t.typeAnnotations + |
273 t.getAnnotationMirrors() + |
275 " " + className((ClassType)t.underlyingType, false, locale); |
274 " " + className((ClassType)t.unannotatedType(), false, locale); |
276 } else { |
275 } else { |
277 return t.typeAnnotations + " " + visit(t.underlyingType, locale); |
276 return t.getAnnotationMirrors() + " " + visit(t.unannotatedType(), locale); |
278 } |
277 } |
279 } else { |
278 } else { |
280 return visit(t.underlyingType, locale); |
279 return visit(t.unannotatedType(), locale); |
281 } |
280 } |
282 } |
281 } |
283 |
282 |
284 public String visitType(Type t, Locale locale) { |
283 public String visitType(Type t, Locale locale) { |
285 String s = (t.tsym == null || t.tsym.name == null) |
284 String s = (t.tsym == null || t.tsym.name == null) |