1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue May 14 10:14:52 2013 -0700
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue May 14 10:14:52 2013 -0700
1.3 @@ -373,8 +373,7 @@
1.4 continue;
1.5 }
1.6 Content classContent = getLink(new LinkInfoImpl(
1.7 - configuration, LinkInfoImpl.Kind.PACKAGE, classes[i],
1.8 - false));
1.9 + configuration, LinkInfoImpl.Kind.PACKAGE, classes[i]));
1.10 Content tdClass = HtmlTree.TD(HtmlStyle.colFirst, classContent);
1.11 HtmlTree tr = HtmlTree.TR(tdClass);
1.12 if (i%2 == 0)
1.13 @@ -1192,8 +1191,8 @@
1.14 * @return a content tree for the link
1.15 */
1.16 public Content getQualifiedClassLink(LinkInfoImpl.Kind context, ClassDoc cd) {
1.17 - return getLink(new LinkInfoImpl(configuration, context, cd,
1.18 - new StringContent(configuration.getClassName(cd)), ""));
1.19 + return getLink(new LinkInfoImpl(configuration, context, cd)
1.20 + .label(configuration.getClassName(cd)));
1.21 }
1.22
1.23 /**
1.24 @@ -1224,7 +1223,7 @@
1.25 classlink.addContent(getPkgName(cd));
1.26 }
1.27 classlink.addContent(getLink(new LinkInfoImpl(configuration,
1.28 - context, cd, cd.name(), isStrong)));
1.29 + context, cd).label(cd.name()).strong(isStrong)));
1.30 return classlink;
1.31 }
1.32
1.33 @@ -1245,7 +1244,7 @@
1.34 contentTree.addContent(getPkgName(cd));
1.35 }
1.36 contentTree.addContent(getLink(new LinkInfoImpl(configuration,
1.37 - context, cd, cd.name(), isStrong)));
1.38 + context, cd).label(cd.name()).strong(isStrong)));
1.39 }
1.40
1.41 /**
1.42 @@ -1329,11 +1328,11 @@
1.43 return label;
1.44 } else if (doc instanceof ExecutableMemberDoc) {
1.45 ExecutableMemberDoc emd = (ExecutableMemberDoc)doc;
1.46 - return getLink(new LinkInfoImpl(configuration, context, classDoc,
1.47 - getAnchor(emd, isProperty), label, strong));
1.48 + return getLink(new LinkInfoImpl(configuration, context, classDoc)
1.49 + .label(label).where(getAnchor(emd, isProperty)).strong(strong));
1.50 } else if (doc instanceof MemberDoc) {
1.51 - return getLink(new LinkInfoImpl(configuration, context, classDoc,
1.52 - doc.name(), label, strong));
1.53 + return getLink(new LinkInfoImpl(configuration, context, classDoc)
1.54 + .label(label).where(doc.name()).strong(strong));
1.55 } else {
1.56 return label;
1.57 }
1.58 @@ -1356,12 +1355,12 @@
1.59 Util.isLinkable(classDoc, configuration))) {
1.60 return label;
1.61 } else if (doc instanceof ExecutableMemberDoc) {
1.62 - ExecutableMemberDoc emd = (ExecutableMemberDoc)doc;
1.63 - return getLink(new LinkInfoImpl(configuration, context, classDoc,
1.64 - getAnchor(emd), label, false));
1.65 + ExecutableMemberDoc emd = (ExecutableMemberDoc) doc;
1.66 + return getLink(new LinkInfoImpl(configuration, context, classDoc)
1.67 + .label(label).where(getAnchor(emd)));
1.68 } else if (doc instanceof MemberDoc) {
1.69 - return getLink(new LinkInfoImpl(configuration, context, classDoc,
1.70 - doc.name(), label, false));
1.71 + return getLink(new LinkInfoImpl(configuration, context, classDoc)
1.72 + .label(label).where(doc.name()));
1.73 } else {
1.74 return label;
1.75 }
1.76 @@ -1447,7 +1446,8 @@
1.77 if (label.isEmpty()) {
1.78 label = plainOrCode(plain, new StringContent(refClass.name()));
1.79 }
1.80 - return getLink(new LinkInfoImpl(configuration, refClass, label)).toString();
1.81 + return getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.DEFAULT, refClass)
1.82 + .label(label)).toString();
1.83 } else if (refMem == null) {
1.84 // Must be a member reference since refClass is not null and refMemName is not null.
1.85 // However, refMem is null, so this referenced member does not exist.
