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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Tue May 14 10:14:51 2013 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Tue May 14 10:14:52 2013 -0700
     1.3 @@ -259,7 +259,7 @@
     1.4                  getTableCaption(configuration.getText(
     1.5                  "doclet.ClassUse_Packages.that.use.0",
     1.6                  getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc,
     1.7 -                false)))));
     1.8 +                false)).toString())));
     1.9          table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
    1.10          Content tbody = new HtmlTree(HtmlTag.TBODY);
    1.11          Iterator<PackageDoc> it = pkgSet.iterator();
    1.12 @@ -294,7 +294,7 @@
    1.13                  getTableCaption(configuration.getText(
    1.14                  "doclet.ClassUse_PackageAnnotation",
    1.15                  getLink(new LinkInfoImpl(configuration,
    1.16 -                        LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc, false)))));
    1.17 +                        LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc, false)).toString())));
    1.18          table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
    1.19          Content tbody = new HtmlTree(HtmlTag.TBODY);
    1.20          Iterator<PackageDoc> it = pkgToPackageAnnotations.iterator();
    1.21 @@ -334,8 +334,8 @@
    1.22              Content link = new RawHtml(
    1.23                      configuration.getText("doclet.ClassUse_Uses.of.0.in.1",
    1.24                      getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER,
    1.25 -                    classdoc, false)),
    1.26 -                    getPackageLinkString(pkg, Util.getPackageName(pkg), false)));
    1.27 +                    classdoc, false)).toString(),
    1.28 +                    getPackageLinkString(pkg, Util.escapeHtmlChars(Util.getPackageName(pkg)), false)));
    1.29              Content heading = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING, link);
    1.30              li.addContent(heading);
    1.31              addClassUse(pkg, li);
    1.32 @@ -369,8 +369,8 @@
    1.33       */
    1.34      protected void addClassUse(PackageDoc pkg, Content contentTree) throws IOException {
    1.35          String classLink = getLink(new LinkInfoImpl(configuration,
    1.36 -            LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc, false));
    1.37 -        String pkgLink = getPackageLinkString(pkg, Util.getPackageName(pkg), false);
    1.38 +            LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc, false)).toString();
    1.39 +        String pkgLink = getPackageLinkString(pkg, Util.escapeHtmlChars(Util.getPackageName(pkg)), false);
    1.40          classSubWriter.addUseInfo(pkgToClassAnnotations.get(pkg.name()),
    1.41                  configuration.getText("doclet.ClassUse_Annotation", classLink,
    1.42                  pkgLink), classUseTableSummary, contentTree);
    1.43 @@ -476,9 +476,9 @@
    1.44       * @return a content tree for the class page link
    1.45       */
    1.46      protected Content getNavLinkClass() {
    1.47 -        Content linkContent = new RawHtml(getLink(new LinkInfoImpl(
    1.48 +        Content linkContent = getLink(new LinkInfoImpl(
    1.49                  configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc,
    1.50 -                "", configuration.getText("doclet.Class"), false)));
    1.51 +                "", configuration.getText("doclet.Class"), false));
    1.52          Content li = HtmlTree.LI(linkContent);
    1.53          return li;
    1.54      }