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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Wed Oct 17 16:43:26 2012 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Tue Oct 23 13:20:37 2012 -0700
     1.3 @@ -82,7 +82,6 @@
     1.4      final String methodUseTableSummary;
     1.5      final String constructorUseTableSummary;
     1.6  
     1.7 -
     1.8      /**
     1.9       * Constructor.
    1.10       *
    1.11 @@ -91,10 +90,9 @@
    1.12       * @throws DocletAbortException
    1.13       */
    1.14      public ClassUseWriter(ConfigurationImpl configuration,
    1.15 -                          ClassUseMapper mapper, String path,
    1.16 -                          String filename, String relpath,
    1.17 +                          ClassUseMapper mapper, DocPath filename,
    1.18                            ClassDoc classdoc) throws IOException {
    1.19 -        super(configuration, path, filename, relpath);
    1.20 +        super(configuration, filename);
    1.21          this.classdoc = classdoc;
    1.22          if (mapper.classToPackageAnnotations.containsKey(classdoc.qualifiedName()))
    1.23                  pkgToPackageAnnotations = new HashSet<PackageDoc>(mapper.classToPackageAnnotations.get(classdoc.qualifiedName()));
    1.24 @@ -199,23 +197,19 @@
    1.25      public static void generate(ConfigurationImpl configuration,
    1.26                                  ClassUseMapper mapper, ClassDoc classdoc) {
    1.27          ClassUseWriter clsgen;
    1.28 -        String path = DirectoryManager.getDirectoryPath(classdoc.
    1.29 -                                                            containingPackage());
    1.30 -        path += "class-use" + DirectoryManager.URL_FILE_SEPARATOR;
    1.31 -        String filename = classdoc.name() + ".html";
    1.32 -        String pkgname = classdoc.containingPackage().name();
    1.33 -        pkgname += (pkgname.length() > 0)? ".class-use": "class-use";
    1.34 -        String relpath = DirectoryManager.getRelativePath(pkgname);
    1.35 +        DocPath path = DocPath.forPackage(classdoc)
    1.36 +                .resolve(DocPaths.CLASS_USE)
    1.37 +                .resolve(DocPath.forName(classdoc));
    1.38          try {
    1.39              clsgen = new ClassUseWriter(configuration,
    1.40 -                                        mapper, path, filename,
    1.41 -                                        relpath, classdoc);
    1.42 +                                        mapper, path,
    1.43 +                                        classdoc);
    1.44              clsgen.generateClassUseFile();
    1.45              clsgen.close();
    1.46          } catch (IOException exc) {
    1.47              configuration.standardmessage.
    1.48                  error("doclet.exception_encountered",
    1.49 -                      exc.toString(), filename);
    1.50 +                      exc.toString(), path.getPath());
    1.51              throw new DocletAbortException();
    1.52          }
    1.53      }
    1.54 @@ -359,7 +353,7 @@
    1.55       */
    1.56      protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException {
    1.57          Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst,
    1.58 -                getHyperLink("", pkg.name(), new StringContent(Util.getPackageName(pkg))));
    1.59 +                getHyperLink(pkg.name(), new StringContent(Util.getPackageName(pkg))));
    1.60          contentTree.addContent(tdFirst);
    1.61          HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
    1.62          tdLast.addStyle(HtmlStyle.colLast);
    1.63 @@ -470,8 +464,8 @@
    1.64       * @return a content tree for the package link
    1.65       */
    1.66      protected Content getNavLinkPackage() {
    1.67 -        Content linkContent = getHyperLink("../package-summary.html", "",
    1.68 -                packageLabel);
    1.69 +        Content linkContent =
    1.70 +                getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY), "", packageLabel);
    1.71          Content li = HtmlTree.LI(linkContent);
    1.72          return li;
    1.73      }
    1.74 @@ -506,8 +500,8 @@
    1.75       */
    1.76      protected Content getNavLinkTree() {
    1.77          Content linkContent = classdoc.containingPackage().isIncluded() ?
    1.78 -            getHyperLink("../package-tree.html", "", treeLabel) :
    1.79 -            getHyperLink(relativePath + "overview-tree.html", "", treeLabel);
    1.80 +            getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_TREE), "", treeLabel) :
    1.81 +            getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), "", treeLabel);
    1.82          Content li = HtmlTree.LI(linkContent);
    1.83          return li;
    1.84      }