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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Fri Feb 22 18:19:51 2013 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Sun Feb 24 11:36:58 2013 -0800
     1.3 @@ -543,7 +543,8 @@
     1.4              }
     1.5              HtmlTree navList = new HtmlTree(HtmlTag.UL);
     1.6              navList.addStyle(HtmlStyle.navList);
     1.7 -            navList.addAttr(HtmlAttr.TITLE, "Navigation");
     1.8 +            navList.addAttr(HtmlAttr.TITLE,
     1.9 +                            configuration.getText("doclet.Navigation"));
    1.10              if (configuration.createoverview) {
    1.11                  navList.addContent(getNavLinkContents());
    1.12              }
    1.13 @@ -1299,13 +1300,31 @@
    1.14       */
    1.15      public String getDocLink(int context, ClassDoc classDoc, MemberDoc doc,
    1.16          String label, boolean strong) {
    1.17 +        return getDocLink(context, classDoc, doc, label, strong, false);
    1.18 +    }
    1.19 +
    1.20 +   /**
    1.21 +     * Return the link for the given member.
    1.22 +     *
    1.23 +     * @param context the id of the context where the link will be printed.
    1.24 +     * @param classDoc the classDoc that we should link to.  This is not
    1.25 +     *                 necessarily equal to doc.containingClass().  We may be
    1.26 +     *                 inheriting comments.
    1.27 +     * @param doc the member being linked to.
    1.28 +     * @param label the label for the link.
    1.29 +     * @param strong true if the link should be strong.
    1.30 +     * @param isProperty true if the doc parameter is a JavaFX property.
    1.31 +     * @return the link for the given member.
    1.32 +     */
    1.33 +    public String getDocLink(int context, ClassDoc classDoc, MemberDoc doc,
    1.34 +        String label, boolean strong, boolean isProperty) {
    1.35          if (! (doc.isIncluded() ||
    1.36              Util.isLinkable(classDoc, configuration))) {
    1.37              return label;
    1.38          } else if (doc instanceof ExecutableMemberDoc) {
    1.39              ExecutableMemberDoc emd = (ExecutableMemberDoc)doc;
    1.40              return getLink(new LinkInfoImpl(configuration, context, classDoc,
    1.41 -                getAnchor(emd), label, strong));
    1.42 +                getAnchor(emd, isProperty), label, strong));
    1.43          } else if (doc instanceof MemberDoc) {
    1.44              return getLink(new LinkInfoImpl(configuration, context, classDoc,
    1.45                  doc.name(), label, strong));
    1.46 @@ -1343,6 +1362,13 @@
    1.47      }
    1.48  
    1.49      public String getAnchor(ExecutableMemberDoc emd) {
    1.50 +        return getAnchor(emd, false);
    1.51 +    }
    1.52 +
    1.53 +    public String getAnchor(ExecutableMemberDoc emd, boolean isProperty) {
    1.54 +        if (isProperty) {
    1.55 +            return emd.name();
    1.56 +        }
    1.57          StringBuilder signature = new StringBuilder(emd.signature());
    1.58          StringBuilder signatureParsed = new StringBuilder();
    1.59          int counter = 0;