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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Thu Oct 10 08:51:55 2013 +0200
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Thu Oct 10 10:51:15 2013 -0700
     1.3 @@ -85,7 +85,8 @@
     1.4              Content memberDetailsTree) {
     1.5          memberDetailsTree.addContent(HtmlConstants.START_OF_METHOD_DETAILS);
     1.6          Content methodDetailsTree = writer.getMemberTreeHeader();
     1.7 -        methodDetailsTree.addContent(writer.getMarkerAnchor("method_detail"));
     1.8 +        methodDetailsTree.addContent(writer.getMarkerAnchor(
     1.9 +                SectionName.METHOD_DETAIL));
    1.10          Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
    1.11                  writer.methodDetailsLabel);
    1.12          methodDetailsTree.addContent(heading);
    1.13 @@ -244,7 +245,8 @@
    1.14       * {@inheritDoc}
    1.15       */
    1.16      public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
    1.17 -        memberTree.addContent(writer.getMarkerAnchor("method_summary"));
    1.18 +        memberTree.addContent(writer.getMarkerAnchor(
    1.19 +                SectionName.METHOD_SUMMARY));
    1.20      }
    1.21  
    1.22      /**
    1.23 @@ -252,8 +254,7 @@
    1.24       */
    1.25      public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
    1.26          inheritedTree.addContent(writer.getMarkerAnchor(
    1.27 -                "methods_inherited_from_class_" +
    1.28 -                configuration.getClassName(cd)));
    1.29 +                SectionName.METHODS_INHERITANCE, configuration.getClassName(cd)));
    1.30      }
    1.31  
    1.32      /**
    1.33 @@ -318,7 +319,7 @@
    1.34              Content methlink = writer.getLink(
    1.35                      new LinkInfoImpl(writer.configuration, LinkInfoImpl.Kind.MEMBER,
    1.36                      overriddenType.asClassDoc())
    1.37 -                    .where(writer.getAnchor(method)).label(name));
    1.38 +                    .where(writer.getName(writer.getAnchor(method))).label(name));
    1.39              Content codeMethLink = HtmlTree.CODE(methlink);
    1.40              Content dd = HtmlTree.DD(codeMethLink);
    1.41              dd.addContent(writer.getSpace());
    1.42 @@ -400,11 +401,15 @@
    1.43       */
    1.44      protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
    1.45          if (link) {
    1.46 -            return writer.getHyperLink((cd == null)?
    1.47 -                "method_summary":
    1.48 -                "methods_inherited_from_class_" +
    1.49 -                configuration.getClassName(cd),
    1.50 -                writer.getResource("doclet.navMethod"));
    1.51 +            if (cd == null) {
    1.52 +                return writer.getHyperLink(
    1.53 +                        SectionName.METHOD_SUMMARY,
    1.54 +                        writer.getResource("doclet.navMethod"));
    1.55 +            } else {
    1.56 +                return writer.getHyperLink(
    1.57 +                        SectionName.METHODS_INHERITANCE,
    1.58 +                        configuration.getClassName(cd), writer.getResource("doclet.navMethod"));
    1.59 +            }
    1.60          } else {
    1.61              return writer.getResource("doclet.navMethod");
    1.62          }
    1.63 @@ -415,8 +420,8 @@
    1.64       */
    1.65      protected void addNavDetailLink(boolean link, Content liNav) {
    1.66          if (link) {
    1.67 -            liNav.addContent(writer.getHyperLink("method_detail",
    1.68 -                    writer.getResource("doclet.navMethod")));
    1.69 +            liNav.addContent(writer.getHyperLink(
    1.70 +                    SectionName.METHOD_DETAIL, writer.getResource("doclet.navMethod")));
    1.71          } else {
    1.72              liNav.addContent(writer.getResource("doclet.navMethod"));
    1.73          }