diff -r 4a1c57a1c410 -r c002fdee76fd src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java --- a/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java Tue Oct 23 13:58:56 2012 -0700 +++ b/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java Thu Oct 25 11:09:36 2012 -0700 @@ -31,7 +31,7 @@ import com.sun.tools.javac.code.Type; import com.sun.tools.javac.code.Type.ClassType; -import static com.sun.tools.javac.code.TypeTags.*; +import static com.sun.tools.javac.code.TypeTag.CLASS; /** @@ -95,7 +95,7 @@ * Return null is this is a top-level type. */ public com.sun.javadoc.Type containingType() { - if (type.getEnclosingType().tag == CLASS) { + if (type.getEnclosingType().hasTag(CLASS)) { // This is the type of an inner class. return TypeMaker.getType(env, type.getEnclosingType()); } @@ -134,7 +134,7 @@ return TypeMaker.getTypeName(cl, full); } StringBuilder s = new StringBuilder(); - if (cl.getEnclosingType().tag != CLASS) { // if not an inner class... + if (!(cl.getEnclosingType().hasTag(CLASS))) { // if not an inner class... s.append(TypeMaker.getTypeName(cl, full)); } else { ClassType encl = (ClassType)cl.getEnclosingType();