jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java

-:78962d89f283
+:4a1c57a1c410
 * @param label tag for the link
 * @return a content for the target package link
 */
 public Content getTargetPackageLink(PackageDoc pd, String target,
 Content label) {
-return getHyperLink(pathString(pd, DocPaths.PACKAGE_SUMMARY), "", label, "", target);
+return getHyperLink(pathString(pd, DocPaths.PACKAGE_SUMMARY), label, "", target);
 }
 /**
 * Generates the HTML document tree and prints it out.
 *
 body.addContent(HtmlConstants.START_OF_TOP_NAVBAR);
 navDiv.addStyle(HtmlStyle.topNav);
 allClassesId += "navbar_top";
 Content a = getMarkerAnchor("navbar_top");
 navDiv.addContent(a);
-Content skipLinkContent = getHyperLink("",
+Content skipLinkContent = getHyperLink(DocLink.fragment("skip-navbar_top"),
-"skip-navbar_top", HtmlTree.EMPTY, configuration.getText(
+HtmlTree.EMPTY,
-"doclet.Skip_navigation_links"), "");
+configuration.getText("doclet.Skip_navigation_links"),
+"");
 navDiv.addContent(skipLinkContent);
 } else {
 body.addContent(HtmlConstants.START_OF_BOTTOM_NAVBAR);
 navDiv.addStyle(HtmlStyle.bottomNav);
 allClassesId += "navbar_bottom";
 Content a = getMarkerAnchor("navbar_bottom");
 navDiv.addContent(a);
-Content skipLinkContent = getHyperLink("",
+Content skipLinkContent = getHyperLink(DocLink.fragment("skip-navbar_bottom"),
-"skip-navbar_bottom", HtmlTree.EMPTY, configuration.getText(
+HtmlTree.EMPTY,
-"doclet.Skip_navigation_links"), "");
+configuration.getText("doclet.Skip_navigation_links"),
+"");
 navDiv.addContent(skipLinkContent);
 }
 if (header) {
 navDiv.addContent(getMarkerAnchor("navbar_top_firstrow"));
 } else {
 *
 * @return a content tree for the link
 */
 protected Content getNavLinkContents() {
 Content linkContent = getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_SUMMARY),
-"", overviewLabel, "", "");
+overviewLabel, "", "");
 Content li = HtmlTree.LI(linkContent);
 return li;
 }
 /**
 * @return a content tree for the link
 */
 public Content getNavLinkPrevious(DocPath prev) {
 Content li;
 if (prev != null) {
-li = HtmlTree.LI(getHyperLink(prev, "", prevLabel, "", ""));
+li = HtmlTree.LI(getHyperLink(prev, prevLabel, "", ""));
 }
 else
 li = HtmlTree.LI(prevLabel);
 return li;
 }
 * @return a content tree for the link
 */
 public Content getNavLinkNext(DocPath next) {
 Content li;
 if (next != null) {
-li = HtmlTree.LI(getHyperLink(next, "", nextLabel, "", ""));
+li = HtmlTree.LI(getHyperLink(next, nextLabel, "", ""));
 }
 else
 li = HtmlTree.LI(nextLabel);
 return li;
 }
 *
 * @param link File to be linked, "index.html"
 * @return a content tree for the link
 */
 protected Content getNavShowLists(DocPath link) {
-Content framesContent = getHyperLink(link.getPath() + "?" + path.getPath(),
+DocLink dl = new DocLink(link, path.getPath(), null);
-"", framesLabel, "", "_top");
+Content framesContent = getHyperLink(dl, framesLabel, "", "_top");
 Content li = HtmlTree.LI(framesContent);
 return li;
 }
 /**
 *
 * @param link File to be linked
 * @return a content tree for the link
 */
 protected Content getNavHideLists(DocPath link) {
-Content noFramesContent = getHyperLink(link, "", noframesLabel, "", "_top");
+Content noFramesContent = getHyperLink(link, noframesLabel, "", "_top");
 Content li = HtmlTree.LI(noFramesContent);
 return li;
 }
 /**
 protected Content getNavLinkTree() {
 Content treeLinkContent;
 PackageDoc[] packages = configuration.root.specifiedPackages();
 if (packages.length == 1 && configuration.root.specifiedClasses().length == 0) {
 treeLinkContent = getHyperLink(pathString(packages[0],
-DocPaths.PACKAGE_TREE), "", treeLabel,
+DocPaths.PACKAGE_TREE), treeLabel,
 "", "");
 } else {
 treeLinkContent = getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE),
-"", treeLabel, "", "");
+treeLabel, "", "");
 }
 Content li = HtmlTree.LI(treeLinkContent);
 return li;
 }
 *
 * @return a content tree for the link
 */
 protected Content getNavLinkDeprecated() {
 Content linkContent = getHyperLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
-"", deprecatedLabel, "", "");
+deprecatedLabel, "", "");
 Content li = HtmlTree.LI(linkContent);
 return li;
 }
 /**
 *
 * @return a content tree for the link
 */
 protected Content getNavLinkClassIndex() {
 Content allClassesContent = getHyperLink(pathToRoot.resolve(
-DocPaths.ALLCLASSES_NOFRAME), "",
+DocPaths.ALLCLASSES_NOFRAME),
 allclassesLabel, "", "");
 Content li = HtmlTree.LI(allClassesContent);
 return li;
 }
 */
 protected Content getNavLinkIndex() {
 Content linkContent = getHyperLink(pathToRoot.resolve(
 (configuration.splitindex
 ? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1))
-: DocPaths.INDEX_ALL)), "",
+: DocPaths.INDEX_ALL)),
 indexLabel, "", "");
 Content li = HtmlTree.LI(linkContent);
 return li;
 }
 if (helpfile.isEmpty()) {
 helpfilenm = DocPaths.HELP_DOC;
 } else {
 helpfilenm = DocPath.create(new File(helpfile).getName());
 }
-Content linkContent = getHyperLink(pathToRoot.resolve(helpfilenm), "",
+Content linkContent = getHyperLink(pathToRoot.resolve(helpfilenm),
 helpLabel, "", "");
 Content li = HtmlTree.LI(linkContent);
 return li;
 }
 }
 }
 }
 if (included || pkg == null) {
 return getHyperLinkString(pathString(pkg, DocPaths.PACKAGE_SUMMARY),
-"", label, isStrong, style);
+label, isStrong, style);
 } else {
-String crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg));
+DocLink crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg));
 if (crossPkgLink != null) {
-return getHyperLinkString(/*TEMP*/ DocPath.create(crossPkgLink), "", label, isStrong, style);
+return getHyperLinkString(crossPkgLink, label, isStrong, style);
 } else {
 return label;
 }
 }
 }
 }
 }
 }
 if (included || pkg == null) {
 return getHyperLink(pathString(pkg, DocPaths.PACKAGE_SUMMARY),
-"", label);
+label);
 } else {
-String crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg));
+DocLink crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg));
 if (crossPkgLink != null) {
-return getHyperLink(/*TEMP*/ DocPath.create(crossPkgLink), "", label);
+return getHyperLink(crossPkgLink, label);
 } else {
 return label;
 }
 }
 }
 cd = (ClassDoc) doc;
 }
 DocPath href = pathToRoot
 .resolve(DocPaths.SOURCE_OUTPUT)
 .resolve(DocPath.forClass(cd));
-Content linkContent = getHyperLink(href, SourceToHTMLConverter.getAnchorName(doc), label, "", "");
+Content linkContent = getHyperLink(href.fragment(SourceToHTMLConverter.getAnchorName(doc)), label, "", "");
 htmltree.addContent(linkContent);
 }
 /**
 * Return the link to the given class.
 *
 * @return the link for the given class.
 */
 public String getLink(LinkInfoImpl linkInfo) {
 LinkFactoryImpl factory = new LinkFactoryImpl(this);
-String link = ((LinkOutputImpl) factory.getLinkOutput(linkInfo)).toString();
+String link = factory.getLinkOutput(linkInfo).toString();
 displayLength += linkInfo.displayLength;
 return link;
 }
 /**
 * @param linkInfo the information about the link.
 * @return the type for the given class.
 */
 public String getTypeParameterLinks(LinkInfoImpl linkInfo) {
 LinkFactoryImpl factory = new LinkFactoryImpl(this);
-return ((LinkOutputImpl)
+return factory.getTypeParameterLinks(linkInfo, false).toString();
-factory.getTypeParameterLinks(linkInfo, false)).toString();
 }
 /*************************************************************
 * Return a class cross link to external class documentation.
 * The name must be fully qualified to determine which package
 * @param code true if the label should be code font.
 */
 public String getCrossClassLink(String qualifiedClassName, String refMemName,
 String label, boolean strong, String style,
 boolean code) {
-String className = "",
+String className = "";
-packageName = qualifiedClassName == null ? "" : qualifiedClassName;
+String packageName = qualifiedClassName == null ? "" : qualifiedClassName;
 int periodIndex;
-while((periodIndex = packageName.lastIndexOf('.')) != -1) {
+while ((periodIndex = packageName.lastIndexOf('.')) != -1) {
 className = packageName.substring(periodIndex + 1, packageName.length()) +
 (className.length() > 0 ? "." + className : "");
 String defaultLabel = code ? codeText(className) : className;
 packageName = packageName.substring(0, periodIndex);
 if (getCrossPackageLink(packageName) != null) {
 //The package exists in external documentation, so link to the external
 //class (assuming that it exists).  This is definitely a limitation of
 //the -link option.  There are ways to determine if an external package
 //exists, but no way to determine if the external class exists.  We just
 //have to assume that it does.
-return getHyperLinkString(
+DocLink link = configuration.extern.getExternalLink(packageName, pathToRoot,
-configuration.extern.getExternalLink(packageName, pathToRoot,
+className + ".html", refMemName);
-className + ".html?is-external=true"),
+return getHyperLinkString(link,
-refMemName == null ? "" : refMemName,
+(label == null) || label.length() == 0 ? defaultLabel : label,
-label == null || label.length() == 0 ? defaultLabel : label,
 strong, style,
 configuration.getText("doclet.Href_Class_Or_Interface_Title", packageName),
 "");
 }
 }
 return configuration.isGeneratedDoc(cd);
 }
 return configuration.extern.isExternal(cd);
 }
-public String getCrossPackageLink(String pkgName) {
+public DocLink getCrossPackageLink(String pkgName) {
 return configuration.extern.getExternalLink(pkgName, pathToRoot,
-"package-summary.html?is-external=true");
+DocPaths.PACKAGE_SUMMARY.getPath());
 }
 /**
 * Get the class link.
 *
 addPreQualifiedClassLink(context, cd, false, contentTree);
 }
 /**
 * Retrieve the class link with the package portion of the label in
-* plain text.  If the qualifier is excluded, it willnot be included in the
+* plain text.  If the qualifier is excluded, it will not be included in the
 * link label.
 *
 * @param cd the class to link to.
 * @param isStrong true if the link should be strong.
 * @return the link with the package portion of the label in plain text.
 if (label.isEmpty())
 label = plainOrCodeText(plain, refPackage.name());
 return getPackageLinkString(refPackage, label, false);
 } else {
 //@see is not referencing an included class or package.  Check for cross links.
-String classCrossLink, packageCrossLink = getCrossPackageLink(refClassName);
+String classCrossLink;
+DocLink packageCrossLink = getCrossPackageLink(refClassName);
 if (packageCrossLink != null) {
 //Package cross link found
-return getHyperLinkString(/*TEMP*/ DocPath.create(packageCrossLink), "",
+return getHyperLinkString(packageCrossLink,
 (label.isEmpty() ? text : label), false);
 } else if ((classCrossLink = getCrossClassLink(refClassName,
 refMemName, label, false, "", !plain)) != null) {
 //Class cross link found (possibly to a member in the class)
 return classCrossLink;

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java

src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java