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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Wed Oct 17 16:43:26 2012 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Tue Oct 23 13:20:37 2012 -0700
     1.3 @@ -65,13 +65,10 @@
     1.4       * @param prevType the previous class that was documented.
     1.5       * @param nextType the next class being documented.
     1.6       */
     1.7 -    public AnnotationTypeWriterImpl (AnnotationTypeDoc annotationType,
     1.8 +    public AnnotationTypeWriterImpl(AnnotationTypeDoc annotationType,
     1.9              Type prevType, Type nextType)
    1.10 -    throws Exception {
    1.11 -        super(ConfigurationImpl.getInstance(),
    1.12 -              DirectoryManager.getDirectoryPath(annotationType.containingPackage()),
    1.13 -              annotationType.name() + ".html",
    1.14 -              DirectoryManager.getRelativePath(annotationType.containingPackage().name()));
    1.15 +            throws Exception {
    1.16 +        super(ConfigurationImpl.getInstance(), DocPath.forClass(annotationType));
    1.17          this.annotationType = annotationType;
    1.18          configuration.currentcd = annotationType.asClassDoc();
    1.19          this.prev = prevType;
    1.20 @@ -84,7 +81,7 @@
    1.21       * @return a content tree for the package link
    1.22       */
    1.23      protected Content getNavLinkPackage() {
    1.24 -        Content linkContent = getHyperLink("package-summary.html", "",
    1.25 +        Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY, "",
    1.26                  packageLabel);
    1.27          Content li = HtmlTree.LI(linkContent);
    1.28          return li;
    1.29 @@ -106,7 +103,7 @@
    1.30       * @return a content tree for the class use link
    1.31       */
    1.32      protected Content getNavLinkClassUse() {
    1.33 -        Content linkContent = getHyperLink("class-use/" + filename, "", useLabel);
    1.34 +        Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), "", useLabel);
    1.35          Content li = HtmlTree.LI(linkContent);
    1.36          return li;
    1.37      }
    1.38 @@ -289,7 +286,7 @@
    1.39       * {@inheritDoc}
    1.40       */
    1.41      protected Content getNavLinkTree() {
    1.42 -        Content treeLinkContent = getHyperLink("package-tree.html",
    1.43 +        Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE,
    1.44                  "", treeLabel, "", "");
    1.45          Content li = HtmlTree.LI(treeLinkContent);
    1.46          return li;