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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Wed Oct 17 16:43:26 2012 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Tue Oct 23 13:20:37 2012 -0700
     1.3 @@ -63,7 +63,7 @@
     1.4       * @param filename File to be generated.
     1.5       */
     1.6      public FrameOutputWriter(ConfigurationImpl configuration,
     1.7 -                             String filename) throws IOException {
     1.8 +                             DocPath filename) throws IOException {
     1.9          super(configuration, filename);
    1.10      noOfPackages = configuration.packages.length;
    1.11      }
    1.12 @@ -77,9 +77,9 @@
    1.13       */
    1.14      public static void generate(ConfigurationImpl configuration) {
    1.15          FrameOutputWriter framegen;
    1.16 -        String filename = "";
    1.17 +        DocPath filename = DocPath.empty;
    1.18          try {
    1.19 -            filename = "index.html";
    1.20 +            filename = DocPaths.INDEX;
    1.21              framegen = new FrameOutputWriter(configuration, filename);
    1.22              framegen.generateFrameFile();
    1.23              framegen.close();
    1.24 @@ -92,7 +92,7 @@
    1.25      }
    1.26  
    1.27      /**
    1.28 -     * Generate the contants in the "index.html" file. Print the frame details
    1.29 +     * Generate the constants in the "index.html" file. Print the frame details
    1.30       * as well as warning if browser is not supporting the Html frames.
    1.31       */
    1.32      protected void generateFrameFile() throws IOException {
    1.33 @@ -155,8 +155,8 @@
    1.34       * @param contentTree the content tree to which the information will be added
    1.35       */
    1.36      private void addAllPackagesFrameTag(Content contentTree) {
    1.37 -        HtmlTree frame = HtmlTree.FRAME("overview-frame.html", "packageListFrame",
    1.38 -                configuration.getText("doclet.All_Packages"));
    1.39 +        HtmlTree frame = HtmlTree.FRAME(DocPaths.OVERVIEW_FRAME.getPath(),
    1.40 +                "packageListFrame", configuration.getText("doclet.All_Packages"));
    1.41          contentTree.addContent(frame);
    1.42      }
    1.43  
    1.44 @@ -166,8 +166,8 @@
    1.45       * @param contentTree the content tree to which the information will be added
    1.46       */
    1.47      private void addAllClassesFrameTag(Content contentTree) {
    1.48 -        HtmlTree frame = HtmlTree.FRAME("allclasses-frame.html", "packageFrame",
    1.49 -                configuration.getText("doclet.All_classes_and_interfaces"));
    1.50 +        HtmlTree frame = HtmlTree.FRAME(DocPaths.ALLCLASSES_FRAME.getPath(),
    1.51 +                "packageFrame", configuration.getText("doclet.All_classes_and_interfaces"));
    1.52          contentTree.addContent(frame);
    1.53      }
    1.54  
    1.55 @@ -177,7 +177,7 @@
    1.56       * @param contentTree the content tree to which the information will be added
    1.57       */
    1.58      private void addClassFrameTag(Content contentTree) {
    1.59 -        HtmlTree frame = HtmlTree.FRAME(configuration.topFile, "classFrame",
    1.60 +        HtmlTree frame = HtmlTree.FRAME(configuration.topFile.getPath(), "classFrame",
    1.61                  configuration.getText("doclet.Package_class_and_interface_descriptions"),
    1.62                  SCROLL_YES);
    1.63          contentTree.addContent(frame);