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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java	Tue May 14 10:14:53 2013 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java	Tue May 14 10:14:53 2013 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -113,7 +113,7 @@
    1.11                  getResource("doclet.Overview"));
    1.12              Content liOverview = HtmlTree.LI(HtmlStyle.blockList, overviewHeading);
    1.13              Content line3 = getResource("doclet.Help_line_3",
    1.14 -                    getHyperLinkString(DocPaths.OVERVIEW_SUMMARY,
    1.15 +                    getHyperLink(DocPaths.OVERVIEW_SUMMARY,
    1.16                      configuration.getText("doclet.Overview")));
    1.17              Content overviewPara = HtmlTree.P(line3);
    1.18              liOverview.addContent(overviewPara);
    1.19 @@ -234,8 +234,9 @@
    1.20                      getResource("doclet.Help_line_16"));
    1.21              Content liTree = HtmlTree.LI(HtmlStyle.blockList, treeHead);
    1.22              Content line17 = getResource("doclet.Help_line_17_with_tree_link",
    1.23 -                    getHyperLinkString(DocPaths.OVERVIEW_TREE,
    1.24 -                    configuration.getText("doclet.Class_Hierarchy")));
    1.25 +                    getHyperLink(DocPaths.OVERVIEW_TREE,
    1.26 +                    configuration.getText("doclet.Class_Hierarchy")),
    1.27 +                    HtmlTree.CODE(new StringContent("java.lang.Object")));
    1.28              Content treePara = HtmlTree.P(line17);
    1.29              liTree.addContent(treePara);
    1.30              HtmlTree tul = new HtmlTree(HtmlTag.UL);
    1.31 @@ -252,19 +253,19 @@
    1.32                      getResource("doclet.Deprecated_API"));
    1.33              Content liDeprecated = HtmlTree.LI(HtmlStyle.blockList, dHead);
    1.34              Content line20 = getResource("doclet.Help_line_20_with_deprecated_api_link",
    1.35 -                    getHyperLinkString(DocPaths.DEPRECATED_LIST,
    1.36 +                    getHyperLink(DocPaths.DEPRECATED_LIST,
    1.37                      configuration.getText("doclet.Deprecated_API")));
    1.38              Content dPara = HtmlTree.P(line20);
    1.39              liDeprecated.addContent(dPara);
    1.40              ul.addContent(liDeprecated);
    1.41          }
    1.42          if (configuration.createindex) {
    1.43 -            String indexlink;
    1.44 +            Content indexlink;
    1.45              if (configuration.splitindex) {
    1.46 -                indexlink = getHyperLinkString(DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1)),
    1.47 +                indexlink = getHyperLink(DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1)),
    1.48                          configuration.getText("doclet.Index"));
    1.49              } else {
    1.50 -                indexlink = getHyperLinkString(DocPaths.INDEX_ALL,
    1.51 +                indexlink = getHyperLink(DocPaths.INDEX_ALL,
    1.52                          configuration.getText("doclet.Index"));
    1.53              }
    1.54              Content indexHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
    1.55 @@ -293,7 +294,7 @@
    1.56                  getResource("doclet.All_Classes"));
    1.57          Content liAllClasses = HtmlTree.LI(HtmlStyle.blockList, allclassesHead);
    1.58          Content line27 = getResource("doclet.Help_line_27",
    1.59 -                getHyperLinkString(DocPaths.ALLCLASSES_NOFRAME,
    1.60 +                getHyperLink(DocPaths.ALLCLASSES_NOFRAME,
    1.61                  configuration.getText("doclet.All_Classes")));
    1.62          Content allclassesPara = HtmlTree.P(line27);
    1.63          liAllClasses.addContent(allclassesPara);
    1.64 @@ -309,7 +310,7 @@
    1.65                  getResource("doclet.Constants_Summary"));
    1.66          Content liConst = HtmlTree.LI(HtmlStyle.blockList, constHead);
    1.67          Content line29 = getResource("doclet.Help_line_29",
    1.68 -                getHyperLinkString(DocPaths.CONSTANT_VALUES,
    1.69 +                getHyperLink(DocPaths.CONSTANT_VALUES,
    1.70                  configuration.getText("doclet.Constants_Summary")));
    1.71          Content constPara = HtmlTree.P(line29);
    1.72          liConst.addContent(constPara);