1.1 --- a/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Mon Mar 18 08:46:09 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Mon Mar 18 14:40:32 2013 -0700 1.3 @@ -65,11 +65,11 @@ 1.4 t = env.types.erasure(t); 1.5 } 1.6 if (considerAnnotations 1.7 - && t.getKind() == TypeKind.ANNOTATED) { 1.8 + && t.isAnnotated()) { 1.9 return new AnnotatedTypeImpl(env, (com.sun.tools.javac.code.Type.AnnotatedType) t); 1.10 } 1.11 1.12 - if (t.getKind() == TypeKind.ANNOTATED) { 1.13 + if (t.isAnnotated()) { 1.14 Type.AnnotatedType at = (Type.AnnotatedType) t; 1.15 return new AnnotatedTypeImpl(env, at); 1.16 } 1.17 @@ -147,7 +147,7 @@ 1.18 */ 1.19 static String getTypeString(DocEnv env, Type t, boolean full) { 1.20 // TODO: should annotations be included here? 1.21 - if (t.getKind() == TypeKind.ANNOTATED) { 1.22 + if (t.isAnnotated()) { 1.23 Type.AnnotatedType at = (Type.AnnotatedType)t; 1.24 t = at.underlyingType; 1.25 }