1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue May 14 10:14:52 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue May 14 10:14:52 2013 -0700 1.3 @@ -125,8 +125,8 @@ 1.4 Content li; 1.5 if (prev != null) { 1.6 Content prevLink = getLink(new LinkInfoImpl(configuration, 1.7 - LinkInfoImpl.Kind.CLASS, prev, "", 1.8 - configuration.getText("doclet.Prev_Class"), true)); 1.9 + LinkInfoImpl.Kind.CLASS, prev) 1.10 + .label(configuration.getText("doclet.Prev_Class")).strong(true)); 1.11 li = HtmlTree.LI(prevLink); 1.12 } 1.13 else 1.14 @@ -143,8 +143,8 @@ 1.15 Content li; 1.16 if (next != null) { 1.17 Content nextLink = getLink(new LinkInfoImpl(configuration, 1.18 - LinkInfoImpl.Kind.CLASS, next, "", 1.19 - configuration.getText("doclet.Next_Class"), true)); 1.20 + LinkInfoImpl.Kind.CLASS, next) 1.21 + .label(configuration.getText("doclet.Next_Class")).strong(true)); 1.22 li = HtmlTree.LI(nextLink); 1.23 } 1.24 else 1.25 @@ -185,7 +185,7 @@ 1.26 div.addContent(pkgNameDiv); 1.27 } 1.28 LinkInfoImpl linkInfo = new LinkInfoImpl(configuration, 1.29 - LinkInfoImpl.Kind.CLASS_HEADER, classDoc, false); 1.30 + LinkInfoImpl.Kind.CLASS_HEADER, classDoc); 1.31 //Let's not link to ourselves in the header. 1.32 linkInfo.linkToSelf = false; 1.33 Content headerContent = new StringContent(header); 1.34 @@ -245,7 +245,7 @@ 1.35 addAnnotationInfo(classDoc, pre); 1.36 pre.addContent(modifiers); 1.37 LinkInfoImpl linkInfo = new LinkInfoImpl(configuration, 1.38 - LinkInfoImpl.Kind.CLASS_SIGNATURE, classDoc, false); 1.39 + LinkInfoImpl.Kind.CLASS_SIGNATURE, classDoc); 1.40 //Let's not link to ourselves in the signature. 1.41 linkInfo.linkToSelf = false; 1.42 Content className = new StringContent(classDoc.name()); 1.43 @@ -362,7 +362,7 @@ 1.44 if (type.equals(classDoc)) { 1.45 Content typeParameters = getTypeParameterLinks( 1.46 new LinkInfoImpl(configuration, LinkInfoImpl.Kind.TREE, 1.47 - classDoc, false)); 1.48 + classDoc)); 1.49 if (configuration.shouldExcludeQualifier( 1.50 classDoc.containingPackage().name())) { 1.51 li.addContent(type.asClassDoc().name()); 1.52 @@ -373,9 +373,8 @@ 1.53 } 1.54 } else { 1.55 Content link = getLink(new LinkInfoImpl(configuration, 1.56 - LinkInfoImpl.Kind.CLASS_TREE_PARENT, 1.57 - type instanceof ClassDoc ? (ClassDoc) type : type, 1.58 - configuration.getClassName(type.asClassDoc()), false)); 1.59 + LinkInfoImpl.Kind.CLASS_TREE_PARENT, type) 1.60 + .label(configuration.getClassName(type.asClassDoc()))); 1.61 li.addContent(link); 1.62 } 1.63 return li; 1.64 @@ -521,7 +520,7 @@ 1.65 Content dl = HtmlTree.DL(dt); 1.66 Content dd = new HtmlTree(HtmlTag.DD); 1.67 dd.addContent(getLink(new LinkInfoImpl(configuration, 1.68 - LinkInfoImpl.Kind.CLASS, outerClass, false))); 1.69 + LinkInfoImpl.Kind.CLASS, outerClass))); 1.70 dl.addContent(dd); 1.71 classInfoTree.addContent(dl); 1.72 }