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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Wed Nov 14 17:23:10 2012 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Thu Nov 15 09:18:36 2012 -0800
     1.3 @@ -256,9 +256,9 @@
     1.4       */
     1.5      protected void addPackageList(Content contentTree) throws IOException {
     1.6          Content table = HtmlTree.TABLE(0, 3, 0, useTableSummary,
     1.7 -                getTableCaption(configuration().getText(
     1.8 +                getTableCaption(configuration.getText(
     1.9                  "doclet.ClassUse_Packages.that.use.0",
    1.10 -                getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc,
    1.11 +                getLink(new LinkInfoImpl(configuration, LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc,
    1.12                  false)))));
    1.13          table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
    1.14          Content tbody = new HtmlTree(HtmlTag.TBODY);
    1.15 @@ -287,14 +287,14 @@
    1.16      protected void addPackageAnnotationList(Content contentTree) throws IOException {
    1.17          if ((!classdoc.isAnnotationType()) ||
    1.18                  pkgToPackageAnnotations == null ||
    1.19 -                pkgToPackageAnnotations.size() == 0) {
    1.20 +                pkgToPackageAnnotations.isEmpty()) {
    1.21              return;
    1.22          }
    1.23          Content table = HtmlTree.TABLE(0, 3, 0, useTableSummary,
    1.24 -                getTableCaption(configuration().getText(
    1.25 +                getTableCaption(configuration.getText(
    1.26                  "doclet.ClassUse_PackageAnnotation",
    1.27 -                getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc,
    1.28 -                false)))));
    1.29 +                getLink(new LinkInfoImpl(configuration,
    1.30 +                        LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc, false)))));
    1.31          table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
    1.32          Content tbody = new HtmlTree(HtmlTag.TBODY);
    1.33          Iterator<PackageDoc> it = pkgToPackageAnnotations.iterator();
    1.34 @@ -333,7 +333,7 @@
    1.35              Content li = HtmlTree.LI(HtmlStyle.blockList, getMarkerAnchor(pkg.name()));
    1.36              Content link = new RawHtml(
    1.37                      configuration.getText("doclet.ClassUse_Uses.of.0.in.1",
    1.38 -                    getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_USE_HEADER,
    1.39 +                    getLink(new LinkInfoImpl(configuration, LinkInfoImpl.CONTEXT_CLASS_USE_HEADER,
    1.40                      classdoc, false)),
    1.41                      getPackageLinkString(pkg, Util.getPackageName(pkg), false)));
    1.42              Content heading = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING, link);
    1.43 @@ -368,7 +368,7 @@
    1.44       * @param contentTree the content tree to which the class use information will be added
    1.45       */
    1.46      protected void addClassUse(PackageDoc pkg, Content contentTree) throws IOException {
    1.47 -        String classLink = getLink(new LinkInfoImpl(
    1.48 +        String classLink = getLink(new LinkInfoImpl(configuration,
    1.49              LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc, false));
    1.50          String pkgLink = getPackageLinkString(pkg, Util.getPackageName(pkg), false);
    1.51          classSubWriter.addUseInfo(pkgToClassAnnotations.get(pkg.name()),
    1.52 @@ -477,8 +477,8 @@
    1.53       */
    1.54      protected Content getNavLinkClass() {
    1.55          Content linkContent = new RawHtml(getLink(new LinkInfoImpl(
    1.56 -                LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc, "",
    1.57 -                configuration.getText("doclet.Class"), false)));
    1.58 +                configuration, LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc,
    1.59 +                "", configuration.getText("doclet.Class"), false)));
    1.60          Content li = HtmlTree.LI(linkContent);
    1.61          return li;
    1.62      }