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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java	Wed Oct 17 16:43:26 2012 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java	Tue Oct 23 13:20:37 2012 -0700
     1.3 @@ -67,15 +67,14 @@
     1.4       * @throws DocletAbortException
     1.5       */
     1.6      public PackageTreeWriter(ConfigurationImpl configuration,
     1.7 -                             String path, String filename,
     1.8 +                             DocPath path,
     1.9                               PackageDoc packagedoc,
    1.10                               PackageDoc prev, PackageDoc next)
    1.11                        throws IOException {
    1.12 -        super(configuration, path, filename,
    1.13 +        super(configuration, path,
    1.14                new ClassTree(
    1.15                  configuration.classDocCatalog.allClasses(packagedoc),
    1.16 -                configuration),
    1.17 -              packagedoc);
    1.18 +                configuration));
    1.19          this.packagedoc = packagedoc;
    1.20          this.prev = prev;
    1.21          this.next = next;
    1.22 @@ -96,17 +95,16 @@
    1.23                                  PackageDoc pkg, PackageDoc prev,
    1.24                                  PackageDoc next, boolean noDeprecated) {
    1.25          PackageTreeWriter packgen;
    1.26 -        String path = DirectoryManager.getDirectoryPath(pkg);
    1.27 -        String filename = "package-tree.html";
    1.28 +        DocPath path = DocPath.forPackage(pkg).resolve(DocPaths.PACKAGE_TREE);
    1.29          try {
    1.30 -            packgen = new PackageTreeWriter(configuration, path, filename, pkg,
    1.31 +            packgen = new PackageTreeWriter(configuration, path, pkg,
    1.32                  prev, next);
    1.33              packgen.generatePackageTreeFile();
    1.34              packgen.close();
    1.35          } catch (IOException exc) {
    1.36              configuration.standardmessage.error(
    1.37                          "doclet.exception_encountered",
    1.38 -                        exc.toString(), filename);
    1.39 +                        exc.toString(), path.getPath());
    1.40              throw new DocletAbortException();
    1.41          }
    1.42      }
    1.43 @@ -175,9 +173,8 @@
    1.44          if (prev == null) {
    1.45              return getNavLinkPrevious(null);
    1.46          } else {
    1.47 -            String path = DirectoryManager.getRelativePath(packagedoc.name(),
    1.48 -                    prev.name());
    1.49 -            return getNavLinkPrevious(path + "package-tree.html");
    1.50 +            DocPath path = DocPath.relativePath(packagedoc, prev);
    1.51 +            return getNavLinkPrevious(path.resolve(DocPaths.PACKAGE_TREE));
    1.52          }
    1.53      }
    1.54  
    1.55 @@ -190,9 +187,8 @@
    1.56          if (next == null) {
    1.57              return getNavLinkNext(null);
    1.58          } else {
    1.59 -            String path = DirectoryManager.getRelativePath(packagedoc.name(),
    1.60 -                    next.name());
    1.61 -            return getNavLinkNext(path + "package-tree.html");
    1.62 +            DocPath path = DocPath.relativePath(packagedoc, next);
    1.63 +            return getNavLinkNext(path.resolve(DocPaths.PACKAGE_TREE));
    1.64          }
    1.65      }
    1.66  
    1.67 @@ -202,7 +198,7 @@
    1.68       * @return a content tree for the package link
    1.69       */
    1.70      protected Content getNavLinkPackage() {
    1.71 -        Content linkContent = getHyperLink("package-summary.html", "",
    1.72 +        Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY, "",
    1.73                  packageLabel);
    1.74          Content li = HtmlTree.LI(linkContent);
    1.75          return li;