jdk8-mips64-public/langtools: changeset 1365:2013982bee34

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Mon Oct 15 17:07:55 2012 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Tue Oct 16 21:03:36 2012 -0700
     1.3 @@ -187,23 +187,6 @@
     1.4       */
     1.5      protected abstract void addNavDetailLink(boolean link, Content liNav);
     1.6  
     1.7 -    /***  ***/
     1.8 -
     1.9 -    protected void print(String str) {
    1.10 -        writer.print(str);
    1.11 -        writer.displayLength += str.length();
    1.12 -    }
    1.13 -
    1.14 -    protected void print(char ch) {
    1.15 -        writer.print(ch);
    1.16 -        writer.displayLength++;
    1.17 -    }
    1.18 -
    1.19 -    protected void strong(String str) {
    1.20 -        writer.strong(str);
    1.21 -        writer.displayLength += str.length();
    1.22 -    }
    1.23 -
    1.24      /**
    1.25       * Add the member name to the content tree and modifies the display length.
    1.26       *
    1.27 @@ -310,23 +293,6 @@
    1.28          tdSummaryType.addContent(code);
    1.29      }
    1.30  
    1.31 -    private void printModifier(ProgramElementDoc member) {
    1.32 -        if (member.isProtected()) {
    1.33 -            print("protected ");
    1.34 -        } else if (member.isPrivate()) {
    1.35 -            print("private ");
    1.36 -        } else if (!member.isPublic()) { // Package private
    1.37 -            writer.printText("doclet.Package_private");
    1.38 -            print(" ");
    1.39 -        }
    1.40 -        if (member.isMethod() && ((MethodDoc)member).isAbstract()) {
    1.41 -            print("abstract ");
    1.42 -        }
    1.43 -        if (member.isStatic()) {
    1.44 -            print("static");
    1.45 -        }
    1.46 -    }
    1.47 -
    1.48      /**
    1.49       * Add the modifier for the member.
    1.50       *

     2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Mon Oct 15 17:07:55 2012 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Tue Oct 16 21:03:36 2012 -0700
     2.3 @@ -206,33 +206,6 @@
     2.4      }
     2.5  
     2.6      /**
     2.7 -     * Print Html Hyper Link, with target frame.  This
     2.8 -     * link will only appear if page is not in a frame.
     2.9 -     *
    2.10 -     * @param link String name of the file.
    2.11 -     * @param where Position in the file
    2.12 -     * @param target Name of the target frame.
    2.13 -     * @param label Tag for the link.
    2.14 -     * @param strong Whether the label should be strong or not?
    2.15 -     */
    2.16 -    public void printNoFramesTargetHyperLink(String link, String where,
    2.17 -                                               String target, String label,
    2.18 -                                               boolean strong) {
    2.19 -        script();
    2.20 -        println("  <!--");
    2.21 -        println("  if(window==top) {");
    2.22 -        println("    document.writeln('"
    2.23 -            + getHyperLinkString(link, where, label, strong, "", "", target) + "');");
    2.24 -        println("  }");
    2.25 -        println("  //-->");
    2.26 -        scriptEnd();
    2.27 -        noScript();
    2.28 -        println("  " + getHyperLinkString(link, where, label, strong, "", "", target));
    2.29 -        noScriptEnd();
    2.30 -        println(DocletConstants.NL);
    2.31 -    }
    2.32 -
    2.33 -    /**
    2.34       * Get the script to show or hide the All classes link.
    2.35       *
    2.36       * @param id id of the element to show or hide
    2.37 @@ -329,14 +302,6 @@
    2.38          return new TagletWriterImpl(this, isFirstSentence);
    2.39      }
    2.40  
    2.41 -    protected void printTagsInfoHeader() {
    2.42 -        dl();
    2.43 -    }
    2.44 -
    2.45 -    protected void printTagsInfoFooter() {
    2.46 -        dlEnd();
    2.47 -    }
    2.48 -
    2.49      /**
    2.50       * Get Package link, with target frame.
    2.51       *
    2.52 @@ -391,7 +356,7 @@
    2.53                  head, body);
    2.54          Content htmlDocument = new HtmlDocument(htmlDocType,
    2.55                  htmlComment, htmlTree);
    2.56 -        htmlDocument.write(this, true);
    2.57 +        write(htmlDocument);
    2.58      }
    2.59  
    2.60      /**
    2.61 @@ -408,26 +373,6 @@
    2.62      }
    2.63  
    2.64      /**
    2.65 -     * Print user specified header and the footer.
    2.66 -     *
    2.67 -     * @param header if true print the user provided header else print the
    2.68 -     * user provided footer.
    2.69 -     */
    2.70 -    public void printUserHeaderFooter(boolean header) {
    2.71 -        em();
    2.72 -        if (header) {
    2.73 -            print(replaceDocRootDir(configuration.header));
    2.74 -        } else {
    2.75 -            if (configuration.footer.length() != 0) {
    2.76 -                print(replaceDocRootDir(configuration.footer));
    2.77 -            } else {
    2.78 -                print(replaceDocRootDir(configuration.header));
    2.79 -            }
    2.80 -        }
    2.81 -        emEnd();
    2.82 -    }
    2.83 -
    2.84 -    /**
    2.85       * Get user specified header and the footer.
    2.86       *
    2.87       * @param header if true print the user provided header else print the
    2.88 @@ -450,14 +395,6 @@
    2.89      }
    2.90  
    2.91      /**
    2.92 -     * Print the user specified top.
    2.93 -     */
    2.94 -    public void printTop() {
    2.95 -        print(replaceDocRootDir(configuration.top));
    2.96 -        hr();
    2.97 -    }
    2.98 -
    2.99 -    /**
   2.100       * Adds the user specified top.
   2.101       *
   2.102       * @param body the content tree to which user specified top will be added
   2.103 @@ -468,14 +405,6 @@
   2.104      }
   2.105  
   2.106      /**
   2.107 -     * Print the user specified bottom.
   2.108 -     */
   2.109 -    public void printBottom() {
   2.110 -        hr();
   2.111 -        print(replaceDocRootDir(configuration.bottom));
   2.112 -    }
   2.113 -
   2.114 -    /**
   2.115       * Adds the user specified bottom.
   2.116       *
   2.117       * @param body the content tree to which user specified bottom will be added
   2.118 @@ -488,128 +417,6 @@
   2.119      }
   2.120  
   2.121      /**
   2.122 -     * Print the navigation bar for the Html page at the top and and the bottom.
   2.123 -     *
   2.124 -     * @param header If true print navigation bar at the top of the page else
   2.125 -     * print the nevigation bar at the bottom.
   2.126 -     */
   2.127 -    protected void navLinks(boolean header) {
   2.128 -        println("");
   2.129 -        if (!configuration.nonavbar) {
   2.130 -            if (header) {
   2.131 -                println(DocletConstants.NL + "<!-- ========= START OF TOP NAVBAR ======= -->");
   2.132 -                anchor("navbar_top");
   2.133 -                println();
   2.134 -                print(getHyperLinkString("", "skip-navbar_top", "", false, "",
   2.135 -                    configuration.getText("doclet.Skip_navigation_links"), ""));
   2.136 -            } else {
   2.137 -                println(DocletConstants.NL + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
   2.138 -                anchor("navbar_bottom");
   2.139 -                println();
   2.140 -                print(getHyperLinkString("", "skip-navbar_bottom", "", false, "",
   2.141 -                    configuration.getText("doclet.Skip_navigation_links"), ""));
   2.142 -            }
   2.143 -            table(0, "100%", 1, 0);
   2.144 -            tr();
   2.145 -            tdColspanBgcolorStyle(2, "#EEEEFF", "NavBarCell1");
   2.146 -            println("");
   2.147 -            if (header) {
   2.148 -                anchor("navbar_top_firstrow");
   2.149 -            } else {
   2.150 -                anchor("navbar_bottom_firstrow");
   2.151 -            }
   2.152 -            table(0, 0, 3);
   2.153 -            print("  ");
   2.154 -            trAlignVAlign("center", "top");
   2.155 -
   2.156 -            if (configuration.createoverview) {
   2.157 -                navLinkContents();
   2.158 -            }
   2.159 -
   2.160 -            if (configuration.packages.length == 1) {
   2.161 -                navLinkPackage(configuration.packages[0]);
   2.162 -            } else if (configuration.packages.length > 1) {
   2.163 -                navLinkPackage();
   2.164 -            }
   2.165 -
   2.166 -            navLinkClass();
   2.167 -
   2.168 -            if(configuration.classuse) {
   2.169 -                navLinkClassUse();
   2.170 -            }
   2.171 -            if(configuration.createtree) {
   2.172 -                navLinkTree();
   2.173 -            }
   2.174 -            if(!(configuration.nodeprecated ||
   2.175 -                     configuration.nodeprecatedlist)) {
   2.176 -                navLinkDeprecated();
   2.177 -            }
   2.178 -            if(configuration.createindex) {
   2.179 -                navLinkIndex();
   2.180 -            }
   2.181 -            if (!configuration.nohelp) {
   2.182 -                navLinkHelp();
   2.183 -            }
   2.184 -            print("  ");
   2.185 -            trEnd();
   2.186 -            tableEnd();
   2.187 -            tdEnd();
   2.188 -
   2.189 -            tdAlignVAlignRowspan("right", "top", 3);
   2.190 -
   2.191 -            printUserHeaderFooter(header);
   2.192 -            tdEnd();
   2.193 -            trEnd();
   2.194 -            println("");
   2.195 -
   2.196 -            tr();
   2.197 -            tdBgcolorStyle("white", "NavBarCell2");
   2.198 -            font("-2");
   2.199 -            space();
   2.200 -            navLinkPrevious();
   2.201 -            space();
   2.202 -            println("");
   2.203 -            space();
   2.204 -            navLinkNext();
   2.205 -            fontEnd();
   2.206 -            tdEnd();
   2.207 -
   2.208 -            tdBgcolorStyle("white", "NavBarCell2");
   2.209 -            font("-2");
   2.210 -            print("  ");
   2.211 -            navShowLists();
   2.212 -            print("  ");
   2.213 -            space();
   2.214 -            println("");
   2.215 -            space();
   2.216 -            navHideLists(filename);
   2.217 -            print("  ");
   2.218 -            space();
   2.219 -            println("");
   2.220 -            space();
   2.221 -            navLinkClassIndex();
   2.222 -            fontEnd();
   2.223 -            tdEnd();
   2.224 -
   2.225 -            trEnd();
   2.226 -
   2.227 -            printSummaryDetailLinks();
   2.228 -
   2.229 -            tableEnd();
   2.230 -            if (header) {
   2.231 -                aName("skip-navbar_top");
   2.232 -                aEnd();
   2.233 -                println(DocletConstants.NL + "<!-- ========= END OF TOP NAVBAR ========= -->");
   2.234 -            } else {
   2.235 -                aName("skip-navbar_bottom");
   2.236 -                aEnd();
   2.237 -                println(DocletConstants.NL + "<!-- ======== END OF BOTTOM NAVBAR ======= -->");
   2.238 -            }
   2.239 -            println("");
   2.240 -        }
   2.241 -    }
   2.242 -
   2.243 -    /**
   2.244       * Adds the navigation bar for the Html page at the top and and the bottom.
   2.245       *
   2.246       * @param header If true print navigation bar at the top of the page else
   2.247 @@ -701,14 +508,6 @@
   2.248      }
   2.249  
   2.250      /**
   2.251 -     * Print the word "NEXT" to indicate that no link is available.  Override
   2.252 -     * this method to customize next link.
   2.253 -     */
   2.254 -    protected void navLinkNext() {
   2.255 -        navLinkNext(null);
   2.256 -    }
   2.257 -
   2.258 -    /**
   2.259       * Get the word "NEXT" to indicate that no link is available.  Override
   2.260       * this method to customize next link.
   2.261       *
   2.262 @@ -719,14 +518,6 @@
   2.263      }
   2.264  
   2.265      /**
   2.266 -     * Print the word "PREV" to indicate that no link is available.  Override
   2.267 -     * this method to customize prev link.
   2.268 -     */
   2.269 -    protected void navLinkPrevious() {
   2.270 -        navLinkPrevious(null);
   2.271 -    }
   2.272 -
   2.273 -    /**
   2.274       * Get the word "PREV" to indicate that no link is available.  Override
   2.275       * this method to customize prev link.
   2.276       *
   2.277 @@ -739,26 +530,10 @@
   2.278      /**
   2.279       * Do nothing. This is the default method.
   2.280       */
   2.281 -    protected void printSummaryDetailLinks() {
   2.282 -    }
   2.283 -
   2.284 -    /**
   2.285 -     * Do nothing. This is the default method.
   2.286 -     */
   2.287      protected void addSummaryDetailLinks(Content navDiv) {
   2.288      }
   2.289  
   2.290      /**
   2.291 -     * Print link to the "overview-summary.html" page.
   2.292 -     */
   2.293 -    protected void navLinkContents() {
   2.294 -        navCellStart();
   2.295 -        printHyperLink(relativePath + "overview-summary.html", "",
   2.296 -                       configuration.getText("doclet.Overview"), true, "NavBarFont1");
   2.297 -        navCellEnd();
   2.298 -    }
   2.299 -
   2.300 -    /**
   2.301       * Get link to the "overview-summary.html" page.
   2.302       *
   2.303       * @return a content tree for the link
   2.304 @@ -771,46 +546,6 @@
   2.305      }
   2.306  
   2.307      /**
   2.308 -     * Description for a cell in the navigation bar.
   2.309 -     */
   2.310 -    protected void navCellStart() {
   2.311 -        print("  ");
   2.312 -        tdBgcolorStyle("#EEEEFF", "NavBarCell1");
   2.313 -        print("    ");
   2.314 -    }
   2.315 -
   2.316 -    /**
   2.317 -     * Description for a cell in the navigation bar, but with reverse
   2.318 -     * high-light effect.
   2.319 -     */
   2.320 -    protected void navCellRevStart() {
   2.321 -        print("  ");
   2.322 -        tdBgcolorStyle("#FFFFFF", "NavBarCell1Rev");
   2.323 -        print(" ");
   2.324 -        space();
   2.325 -    }
   2.326 -
   2.327 -    /**
   2.328 -     * Closing tag for navigation bar cell.
   2.329 -     */
   2.330 -    protected void navCellEnd() {
   2.331 -        space();
   2.332 -        tdEnd();
   2.333 -    }
   2.334 -
   2.335 -    /**
   2.336 -     * Print link to the "package-summary.html" page for the package passed.
   2.337 -     *
   2.338 -     * @param pkg Package to which link will be generated.
   2.339 -     */
   2.340 -    protected void navLinkPackage(PackageDoc pkg) {
   2.341 -        navCellStart();
   2.342 -        printPackageLink(pkg, configuration.getText("doclet.Package"), true,
   2.343 -            "NavBarFont1");
   2.344 -        navCellEnd();
   2.345 -    }
   2.346 -
   2.347 -    /**
   2.348       * Get link to the "package-summary.html" page for the package passed.
   2.349       *
   2.350       * @param pkg Package to which link will be generated
   2.351 @@ -824,18 +559,6 @@
   2.352      }
   2.353  
   2.354      /**
   2.355 -     * Print the word "Package" in the navigation bar cell, to indicate that
   2.356 -     * link is not available here.
   2.357 -     */
   2.358 -    protected void navLinkPackage() {
   2.359 -        navCellStart();
   2.360 -        fontStyle("NavBarFont1");
   2.361 -        printText("doclet.Package");
   2.362 -        fontEnd();
   2.363 -        navCellEnd();
   2.364 -    }
   2.365 -
   2.366 -    /**
   2.367       * Get the word "Package" , to indicate that link is not available here.
   2.368       *
   2.369       * @return a content tree for the link
   2.370 @@ -846,18 +569,6 @@
   2.371      }
   2.372  
   2.373      /**
   2.374 -     * Print the word "Use" in the navigation bar cell, to indicate that link
   2.375 -     * is not available.
   2.376 -     */
   2.377 -    protected void navLinkClassUse() {
   2.378 -        navCellStart();
   2.379 -        fontStyle("NavBarFont1");
   2.380 -        printText("doclet.navClassUse");
   2.381 -        fontEnd();
   2.382 -        navCellEnd();
   2.383 -    }
   2.384 -
   2.385 -    /**
   2.386       * Get the word "Use", to indicate that link is not available.
   2.387       *
   2.388       * @return a content tree for the link
   2.389 @@ -868,20 +579,6 @@
   2.390      }
   2.391  
   2.392      /**
   2.393 -     * Print link for previous file.
   2.394 -     *
   2.395 -     * @param prev File name for the prev link.
   2.396 -     */
   2.397 -    public void navLinkPrevious(String prev) {
   2.398 -        String tag = configuration.getText("doclet.Prev");
   2.399 -        if (prev != null) {
   2.400 -            printHyperLink(prev, "", tag, true) ;
   2.401 -        } else {
   2.402 -            print(tag);
   2.403 -        }
   2.404 -    }
   2.405 -
   2.406 -    /**
   2.407       * Get link for previous file.
   2.408       *
   2.409       * @param prev File name for the prev link
   2.410 @@ -898,21 +595,6 @@
   2.411      }
   2.412  
   2.413      /**
   2.414 -     * Print link for next file.  If next is null, just print the label
   2.415 -     * without linking it anywhere.
   2.416 -     *
   2.417 -     * @param next File name for the next link.
   2.418 -     */
   2.419 -    public void navLinkNext(String next) {
   2.420 -        String tag = configuration.getText("doclet.Next");
   2.421 -        if (next != null) {
   2.422 -            printHyperLink(next, "", tag, true);
   2.423 -        } else {
   2.424 -            print(tag);
   2.425 -        }
   2.426 -    }
   2.427 -
   2.428 -    /**
   2.429       * Get link for next file.  If next is null, just print the label
   2.430       * without linking it anywhere.
   2.431       *
   2.432 @@ -930,16 +612,6 @@
   2.433      }
   2.434  
   2.435      /**
   2.436 -     * Print "FRAMES" link, to switch to the frame version of the output.
   2.437 -     *
   2.438 -     * @param link File to be linked, "index.html".
   2.439 -     */
   2.440 -    protected void navShowLists(String link) {
   2.441 -        print(getHyperLinkString(link + "?" + path + filename, "",
   2.442 -            configuration.getText("doclet.FRAMES"), true, "", "", "_top"));
   2.443 -    }
   2.444 -
   2.445 -    /**
   2.446       * Get "FRAMES" link, to switch to the frame version of the output.
   2.447       *
   2.448       * @param link File to be linked, "index.html"
   2.449 @@ -953,13 +625,6 @@
   2.450      }
   2.451  
   2.452      /**
   2.453 -     * Print "FRAMES" link, to switch to the frame version of the output.
   2.454 -     */
   2.455 -    protected void navShowLists() {
   2.456 -        navShowLists(relativePath + "index.html");
   2.457 -    }
   2.458 -
   2.459 -    /**
   2.460       * Get "FRAMES" link, to switch to the frame version of the output.
   2.461       *
   2.462       * @return a content tree for the link
   2.463 @@ -969,16 +634,6 @@
   2.464      }
   2.465  
   2.466      /**
   2.467 -     * Print "NO FRAMES" link, to switch to the non-frame version of the output.
   2.468 -     *
   2.469 -     * @param link File to be linked.
   2.470 -     */
   2.471 -    protected void navHideLists(String link) {
   2.472 -        print(getHyperLinkString(link, "", configuration.getText("doclet.NO_FRAMES"),
   2.473 -            true, "", "", "_top"));
   2.474 -    }
   2.475 -
   2.476 -    /**
   2.477       * Get "NO FRAMES" link, to switch to the non-frame version of the output.
   2.478       *
   2.479       * @param link File to be linked
   2.480 @@ -991,25 +646,6 @@
   2.481      }
   2.482  
   2.483      /**
   2.484 -     * Print "Tree" link in the navigation bar. If there is only one package
   2.485 -     * specified on the command line, then the "Tree" link will be to the
   2.486 -     * only "package-tree.html" file otherwise it will be to the
   2.487 -     * "overview-tree.html" file.
   2.488 -     */
   2.489 -    protected void navLinkTree() {
   2.490 -        navCellStart();
   2.491 -        PackageDoc[] packages = configuration.root.specifiedPackages();
   2.492 -        if (packages.length == 1 && configuration.root.specifiedClasses().length == 0) {
   2.493 -            printHyperLink(pathString(packages[0], "package-tree.html"), "",
   2.494 -                           configuration.getText("doclet.Tree"), true, "NavBarFont1");
   2.495 -        } else {
   2.496 -            printHyperLink(relativePath + "overview-tree.html", "",
   2.497 -                           configuration.getText("doclet.Tree"), true, "NavBarFont1");
   2.498 -        }
   2.499 -        navCellEnd();
   2.500 -    }
   2.501 -
   2.502 -    /**
   2.503       * Get "Tree" link in the navigation bar. If there is only one package
   2.504       * specified on the command line, then the "Tree" link will be to the
   2.505       * only "package-tree.html" file otherwise it will be to the
   2.506 @@ -1046,18 +682,6 @@
   2.507      }
   2.508  
   2.509      /**
   2.510 -     * Print the word "Class" in the navigation bar cell, to indicate that
   2.511 -     * class link is not available.
   2.512 -     */
   2.513 -    protected void navLinkClass() {
   2.514 -        navCellStart();
   2.515 -        fontStyle("NavBarFont1");
   2.516 -        printText("doclet.Class");
   2.517 -        fontEnd();
   2.518 -        navCellEnd();
   2.519 -    }
   2.520 -
   2.521 -    /**
   2.522       * Get the word "Class", to indicate that class link is not available.
   2.523       *
   2.524       * @return a content tree for the link
   2.525 @@ -1068,16 +692,6 @@
   2.526      }
   2.527  
   2.528      /**
   2.529 -     * Print "Deprecated" API link in the navigation bar.
   2.530 -     */
   2.531 -    protected void navLinkDeprecated() {
   2.532 -        navCellStart();
   2.533 -        printHyperLink(relativePath + "deprecated-list.html", "",
   2.534 -                       configuration.getText("doclet.navDeprecated"), true, "NavBarFont1");
   2.535 -        navCellEnd();
   2.536 -    }
   2.537 -
   2.538 -    /**
   2.539       * Get "Deprecated" API link in the navigation bar.
   2.540       *
   2.541       * @return a content tree for the link
   2.542 @@ -1090,17 +704,6 @@
   2.543      }
   2.544  
   2.545      /**
   2.546 -     * Print link for generated index. If the user has used "-splitindex"
   2.547 -     * command line option, then link to file "index-files/index-1.html" is
   2.548 -     * generated otherwise link to file "index-all.html" is generated.
   2.549 -     */
   2.550 -    protected void navLinkClassIndex() {
   2.551 -        printNoFramesTargetHyperLink(relativePath +
   2.552 -                AllClassesFrameWriter.OUTPUT_FILE_NAME_NOFRAMES,
   2.553 -            "", "", configuration.getText("doclet.All_Classes"), true);
   2.554 -    }
   2.555 -
   2.556 -    /**
   2.557       * Get link for generated index. If the user has used "-splitindex"
   2.558       * command line option, then link to file "index-files/index-1.html" is
   2.559       * generated otherwise link to file "index-all.html" is generated.
   2.560 @@ -1114,20 +717,6 @@
   2.561          Content li = HtmlTree.LI(allClassesContent);
   2.562          return li;
   2.563      }
   2.564 -    /**
   2.565 -     * Print link for generated class index.
   2.566 -     */
   2.567 -    protected void navLinkIndex() {
   2.568 -        navCellStart();
   2.569 -        printHyperLink(relativePath +
   2.570 -                           (configuration.splitindex?
   2.571 -                                DirectoryManager.getPath("index-files") +
   2.572 -                                fileseparator: "") +
   2.573 -                           (configuration.splitindex?
   2.574 -                                "index-1.html" : "index-all.html"), "",
   2.575 -                       configuration.getText("doclet.Index"), true, "NavBarFont1");
   2.576 -        navCellEnd();
   2.577 -    }
   2.578  
   2.579      /**
   2.580       * Get link for generated class index.
   2.581 @@ -1144,27 +733,6 @@
   2.582      }
   2.583  
   2.584      /**
   2.585 -     * Print help file link. If user has provided a help file, then generate a
   2.586 -     * link to the user given file, which is already copied to current or
   2.587 -     * destination directory.
   2.588 -     */
   2.589 -    protected void navLinkHelp() {
   2.590 -        String helpfilenm = configuration.helpfile;
   2.591 -        if (helpfilenm.equals("")) {
   2.592 -            helpfilenm = "help-doc.html";
   2.593 -        } else {
   2.594 -            int lastsep;
   2.595 -            if ((lastsep = helpfilenm.lastIndexOf(File.separatorChar)) != -1) {
   2.596 -                helpfilenm = helpfilenm.substring(lastsep + 1);
   2.597 -            }
   2.598 -        }
   2.599 -        navCellStart();
   2.600 -        printHyperLink(relativePath + helpfilenm, "",
   2.601 -                       configuration.getText("doclet.Help"), true, "NavBarFont1");
   2.602 -        navCellEnd();
   2.603 -    }
   2.604 -
   2.605 -    /**
   2.606       * Get help file link. If user has provided a help file, then generate a
   2.607       * link to the user given file, which is already copied to current or
   2.608       * destination directory.
   2.609 @@ -1188,87 +756,6 @@
   2.610      }
   2.611  
   2.612      /**
   2.613 -     * Print the word "Detail" in the navigation bar. No link is available.
   2.614 -     */
   2.615 -    protected void navDetail() {
   2.616 -        printText("doclet.Detail");
   2.617 -    }
   2.618 -
   2.619 -    /**
   2.620 -     * Print the word "Summary" in the navigation bar. No link is available.
   2.621 -     */
   2.622 -    protected void navSummary() {
   2.623 -        printText("doclet.Summary");
   2.624 -    }
   2.625 -
   2.626 -    /**
   2.627 -     * Print the Html table tag for the index summary tables. The table tag
   2.628 -     * printed is
   2.629 -     * {@code <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%"> }
   2.630 -     */
   2.631 -    public void tableIndexSummary() {
   2.632 -        table(1, "100%", 3, 0);
   2.633 -    }
   2.634 -
   2.635 -    /**
   2.636 -     * Print the Html table tag for the index summary tables.
   2.637 -     *
   2.638 -     * @param summary the summary for the table tag summary attribute.
   2.639 -     */
   2.640 -    public void tableIndexSummary(String summary) {
   2.641 -        table(1, "100%", 3, 0, summary);
   2.642 -    }
   2.643 -
   2.644 -    /**
   2.645 -     * Same as {@link #tableIndexSummary()}.
   2.646 -     */
   2.647 -    public void tableIndexDetail() {
   2.648 -        table(1, "100%", 3, 0);
   2.649 -    }
   2.650 -
   2.651 -    /**
   2.652 -     * Print Html tag for table elements. The tag printed is
   2.653 -     * &lt;TD ALIGN="right" VALIGN="top" WIDTH="1%"&gt;.
   2.654 -     */
   2.655 -    public void tdIndex() {
   2.656 -        print("<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\">");
   2.657 -    }
   2.658 -
   2.659 -    /**
   2.660 -     * Print table caption.
   2.661 -     */
   2.662 -    public void tableCaptionStart() {
   2.663 -        captionStyle("TableCaption");
   2.664 -    }
   2.665 -
   2.666 -    /**
   2.667 -     * Print table sub-caption.
   2.668 -     */
   2.669 -    public void tableSubCaptionStart() {
   2.670 -        captionStyle("TableSubCaption");
   2.671 -    }
   2.672 -
   2.673 -    /**
   2.674 -     * Print table caption end tags.
   2.675 -     */
   2.676 -    public void tableCaptionEnd() {
   2.677 -        captionEnd();
   2.678 -    }
   2.679 -
   2.680 -    /**
   2.681 -     * Print summary table header.
   2.682 -     */
   2.683 -    public void summaryTableHeader(String[] header, String scope) {
   2.684 -        tr();
   2.685 -        for ( int i=0; i < header.length; i++ ) {
   2.686 -            thScopeNoWrap("TableHeader", scope);
   2.687 -            print(header[i]);
   2.688 -            thEnd();
   2.689 -        }
   2.690 -        trEnd();
   2.691 -    }
   2.692 -
   2.693 -    /**
   2.694       * Get summary table header.
   2.695       *
   2.696       * @param header the header for the table
   2.697 @@ -1397,144 +884,6 @@
   2.698      }
   2.699  
   2.700      /**
   2.701 -     * Prine table header information about color, column span and the font.
   2.702 -     *
   2.703 -     * @param color Background color.
   2.704 -     * @param span  Column span.
   2.705 -     */
   2.706 -    public void tableHeaderStart(String color, int span) {
   2.707 -        trBgcolorStyle(color, "TableHeadingColor");
   2.708 -        thAlignColspan("left", span);
   2.709 -        font("+2");
   2.710 -    }
   2.711 -
   2.712 -    /**
   2.713 -     * Print table header for the inherited members summary tables. Print the
   2.714 -     * background color information.
   2.715 -     *
   2.716 -     * @param color Background color.
   2.717 -     */
   2.718 -    public void tableInheritedHeaderStart(String color) {
   2.719 -        trBgcolorStyle(color, "TableSubHeadingColor");
   2.720 -        thAlign("left");
   2.721 -    }
   2.722 -
   2.723 -    /**
   2.724 -     * Print "Use" table header. Print the background color and the column span.
   2.725 -     *
   2.726 -     * @param color Background color.
   2.727 -     */
   2.728 -    public void tableUseInfoHeaderStart(String color) {
   2.729 -        trBgcolorStyle(color, "TableSubHeadingColor");
   2.730 -        thAlignColspan("left", 2);
   2.731 -    }
   2.732 -
   2.733 -    /**
   2.734 -     * Print table header with the background color with default column span 2.
   2.735 -     *
   2.736 -     * @param color Background color.
   2.737 -     */
   2.738 -    public void tableHeaderStart(String color) {
   2.739 -        tableHeaderStart(color, 2);
   2.740 -    }
   2.741 -
   2.742 -    /**
   2.743 -     * Print table header with the column span, with the default color #CCCCFF.
   2.744 -     *
   2.745 -     * @param span Column span.
   2.746 -     */
   2.747 -    public void tableHeaderStart(int span) {
   2.748 -        tableHeaderStart("#CCCCFF", span);
   2.749 -    }
   2.750 -
   2.751 -    /**
   2.752 -     * Print table header with default column span 2 and default color #CCCCFF.
   2.753 -     */
   2.754 -    public void tableHeaderStart() {
   2.755 -        tableHeaderStart(2);
   2.756 -    }
   2.757 -
   2.758 -    /**
   2.759 -     * Print table header end tags for font, column and row.
   2.760 -     */
   2.761 -    public void tableHeaderEnd() {
   2.762 -        fontEnd();
   2.763 -        thEnd();
   2.764 -        trEnd();
   2.765 -    }
   2.766 -
   2.767 -    /**
   2.768 -     * Print table header end tags in inherited tables for column and row.
   2.769 -     */
   2.770 -    public void tableInheritedHeaderEnd() {
   2.771 -        thEnd();
   2.772 -        trEnd();
   2.773 -    }
   2.774 -
   2.775 -    /**
   2.776 -     * Print the summary table row cell attribute width.
   2.777 -     *
   2.778 -     * @param width Width of the table cell.
   2.779 -     */
   2.780 -    public void summaryRow(int width) {
   2.781 -        if (width != 0) {
   2.782 -            tdWidth(width + "%");
   2.783 -        } else {
   2.784 -            td();
   2.785 -        }
   2.786 -    }
   2.787 -
   2.788 -    /**
   2.789 -     * Print the summary table row cell end tag.
   2.790 -     */
   2.791 -    public void summaryRowEnd() {
   2.792 -        tdEnd();
   2.793 -    }
   2.794 -
   2.795 -    /**
   2.796 -     * Print the heading in Html {@literal <H2>} format.
   2.797 -     *
   2.798 -     * @param str The Header string.
   2.799 -     */
   2.800 -    public void printIndexHeading(String str) {
   2.801 -        h2();
   2.802 -        print(str);
   2.803 -        h2End();
   2.804 -    }
   2.805 -
   2.806 -    /**
   2.807 -     * Print Html tag &lt;FRAMESET=arg&gt;.
   2.808 -     *
   2.809 -     * @param arg Argument for the tag.
   2.810 -     */
   2.811 -    public void frameSet(String arg) {
   2.812 -        println("<FRAMESET " + arg + ">");
   2.813 -    }
   2.814 -
   2.815 -    /**
   2.816 -     * Print Html closing tag &lt;/FRAMESET&gt;.
   2.817 -     */
   2.818 -    public void frameSetEnd() {
   2.819 -        println("</FRAMESET>");
   2.820 -    }
   2.821 -
   2.822 -    /**
   2.823 -     * Print Html tag &lt;FRAME=arg&gt;.
   2.824 -     *
   2.825 -     * @param arg Argument for the tag.
   2.826 -     */
   2.827 -    public void frame(String arg) {
   2.828 -        println("<FRAME " + arg + ">");
   2.829 -    }
   2.830 -
   2.831 -    /**
   2.832 -     * Print Html closing tag &lt;/FRAME&gt;.
   2.833 -     */
   2.834 -    public void frameEnd() {
   2.835 -        println("</FRAME>");
   2.836 -    }
   2.837 -
   2.838 -    /**
   2.839       * Return path to the class page for a classdoc. For example, the class
   2.840       * name is "java.lang.Object" and if the current file getting generated is
   2.841       * "java/io/File.html", then the path string to the class, returned is
   2.842 @@ -1573,30 +922,6 @@
   2.843      }
   2.844  
   2.845      /**
   2.846 -     * Print the link to the given package.
   2.847 -     *
   2.848 -     * @param pkg the package to link to.
   2.849 -     * @param label the label for the link.
   2.850 -     * @param isStrong true if the label should be strong.
   2.851 -     */
   2.852 -    public void printPackageLink(PackageDoc pkg, String label, boolean isStrong) {
   2.853 -        print(getPackageLinkString(pkg, label, isStrong));
   2.854 -    }
   2.855 -
   2.856 -    /**
   2.857 -     * Print the link to the given package.
   2.858 -     *
   2.859 -     * @param pkg the package to link to.
   2.860 -     * @param label the label for the link.
   2.861 -     * @param isStrong true if the label should be strong.
   2.862 -     * @param style  the font of the package link label.
   2.863 -     */
   2.864 -    public void printPackageLink(PackageDoc pkg, String label, boolean isStrong,
   2.865 -            String style) {
   2.866 -        print(getPackageLinkString(pkg, label, isStrong, style));
   2.867 -    }
   2.868 -
   2.869 -    /**
   2.870       * Return the link to the given package.
   2.871       *
   2.872       * @param pkg the package to link to.
   2.873 @@ -1679,21 +1004,6 @@
   2.874          return (cd.isInterface())?  italicsText(name): name;
   2.875      }
   2.876  
   2.877 -    public void printSrcLink(ProgramElementDoc d, String label) {
   2.878 -        if (d == null) {
   2.879 -            return;
   2.880 -        }
   2.881 -        ClassDoc cd = d.containingClass();
   2.882 -        if (cd == null) {
   2.883 -            //d must be a class doc since in has no containing class.
   2.884 -            cd = (ClassDoc) d;
   2.885 -        }
   2.886 -        String href = relativePath + DocletConstants.SOURCE_OUTPUT_DIR_NAME
   2.887 -            + DirectoryManager.getDirectoryPath(cd.containingPackage())
   2.888 -            + cd.name() + ".html#" + SourceToHTMLConverter.getAnchorName(d);
   2.889 -        printHyperLink(href, "", label, true);
   2.890 -    }
   2.891 -
   2.892      /**
   2.893       * Add the link to the content tree.
   2.894       *
   2.895 @@ -1743,13 +1053,6 @@
   2.896              factory.getTypeParameterLinks(linkInfo, false)).toString();
   2.897      }
   2.898  
   2.899 -    /**
   2.900 -     * Print the link to the given class.
   2.901 -     */
   2.902 -    public void printLink(LinkInfoImpl linkInfo) {
   2.903 -        print(getLink(linkInfo));
   2.904 -    }
   2.905 -
   2.906      /*************************************************************
   2.907       * Return a class cross link to external class documentation.
   2.908       * The name must be fully qualified to determine which package
   2.909 @@ -1773,7 +1076,7 @@
   2.910          while((periodIndex = packageName.lastIndexOf('.')) != -1) {
   2.911              className = packageName.substring(periodIndex + 1, packageName.length()) +
   2.912                  (className.length() > 0 ? "." + className : "");
   2.913 -            String defaultLabel = code ? getCode() + className + getCodeEnd() : className;
   2.914 +            String defaultLabel = code ? codeText(className) : className;
   2.915              packageName = packageName.substring(0, periodIndex);
   2.916              if (getCrossPackageLink(packageName) != null) {
   2.917                  //The package exists in external documentation, so link to the external
   2.918 @@ -1881,30 +1184,6 @@
   2.919          addPreQualifiedClassLink(context, cd, true, contentTree);
   2.920      }
   2.921  
   2.922 -    public void printText(String key) {
   2.923 -        print(configuration.getText(key));
   2.924 -    }
   2.925 -
   2.926 -    public void printText(String key, String a1) {
   2.927 -        print(configuration.getText(key, a1));
   2.928 -    }
   2.929 -
   2.930 -    public void printText(String key, String a1, String a2) {
   2.931 -        print(configuration.getText(key, a1, a2));
   2.932 -    }
   2.933 -
   2.934 -    public void strongText(String key) {
   2.935 -        strong(configuration.getText(key));
   2.936 -    }
   2.937 -
   2.938 -    public void strongText(String key, String a1) {
   2.939 -        strong(configuration.getText(key, a1));
   2.940 -    }
   2.941 -
   2.942 -    public void strongText(String key, String a1, String a2) {
   2.943 -        strong(configuration.getText(key, a1, a2));
   2.944 -    }
   2.945 -
   2.946      /**
   2.947       * Get the link for the given member.
   2.948       *
   2.949 @@ -1918,22 +1197,6 @@
   2.950      }
   2.951  
   2.952      /**
   2.953 -     * Print the link for the given member.
   2.954 -     *
   2.955 -     * @param context the id of the context where the link will be printed.
   2.956 -     * @param classDoc the classDoc that we should link to.  This is not
   2.957 -     *                 necessarily equal to doc.containingClass().  We may be
   2.958 -     *                 inheriting comments.
   2.959 -     * @param doc the member being linked to.
   2.960 -     * @param label the label for the link.
   2.961 -     * @param strong true if the link should be strong.
   2.962 -     */
   2.963 -    public void printDocLink(int context, ClassDoc classDoc, MemberDoc doc,
   2.964 -            String label, boolean strong) {
   2.965 -        print(getDocLink(context, classDoc, doc, label, strong));
   2.966 -    }
   2.967 -
   2.968 -    /**
   2.969       * Return the link for the given member.
   2.970       *
   2.971       * @param context the id of the context where the link will be printed.
   2.972 @@ -2004,10 +1267,6 @@
   2.973          }
   2.974      }
   2.975  
   2.976 -    public void anchor(ExecutableMemberDoc emd) {
   2.977 -        anchor(getAnchor(emd));
   2.978 -    }
   2.979 -
   2.980      public String getAnchor(ExecutableMemberDoc emd) {
   2.981          StringBuilder signature = new StringBuilder(emd.signature());
   2.982          StringBuilder signatureParsed = new StringBuilder();
   2.983 @@ -2030,66 +1289,61 @@
   2.984          if (! (tagName.startsWith("@link") || tagName.equals("@see"))) {
   2.985              return "";
   2.986          }
   2.987 -        StringBuilder result = new StringBuilder();
   2.988 -        boolean isplaintext = tagName.toLowerCase().equals("@linkplain");
   2.989 -        String label = see.label();
   2.990 -        label = (label.length() > 0)?
   2.991 -            ((isplaintext) ? label :
   2.992 -                 getCode() + label + getCodeEnd()):"";
   2.993 +
   2.994          String seetext = replaceDocRootDir(see.text());
   2.995  
   2.996          //Check if @see is an href or "string"
   2.997          if (seetext.startsWith("<") || seetext.startsWith("\"")) {
   2.998 -            result.append(seetext);
   2.999 -            return result.toString();
  2.1000 +            return seetext;
  2.1001          }
  2.1002  
  2.1003 +        boolean plain = tagName.equalsIgnoreCase("@linkplain");
  2.1004 +        String label = plainOrCodeText(plain, see.label());
  2.1005 +
  2.1006          //The text from the @see tag.  We will output this text when a label is not specified.
  2.1007 -        String text = (isplaintext) ? seetext : getCode() + seetext + getCodeEnd();
  2.1008 +        String text = plainOrCodeText(plain, seetext);
  2.1009  
  2.1010          ClassDoc refClass = see.referencedClass();
  2.1011          String refClassName = see.referencedClassName();
  2.1012          MemberDoc refMem = see.referencedMember();
  2.1013          String refMemName = see.referencedMemberName();
  2.1014 +
  2.1015          if (refClass == null) {
  2.1016              //@see is not referencing an included class
  2.1017              PackageDoc refPackage = see.referencedPackage();
  2.1018              if (refPackage != null && refPackage.isIncluded()) {
  2.1019                  //@see is referencing an included package
  2.1020 -                String packageName = isplaintext ? refPackage.name() :
  2.1021 -                    getCode() + refPackage.name() + getCodeEnd();
  2.1022 -                result.append(getPackageLinkString(refPackage,
  2.1023 -                    label.length() == 0 ? packageName : label, false));
  2.1024 +                if (label.isEmpty())
  2.1025 +                    label = plainOrCodeText(plain, refPackage.name());
  2.1026 +                return getPackageLinkString(refPackage, label, false);
  2.1027              } else {
  2.1028                  //@see is not referencing an included class or package.  Check for cross links.
  2.1029                  String classCrossLink, packageCrossLink = getCrossPackageLink(refClassName);
  2.1030                  if (packageCrossLink != null) {
  2.1031                      //Package cross link found
  2.1032 -                    result.append(getHyperLinkString(packageCrossLink, "",
  2.1033 -                        (label.length() == 0)? text : label, false));
  2.1034 +                    return getHyperLinkString(packageCrossLink, "",
  2.1035 +                        (label.isEmpty() ? text : label), false);
  2.1036                  } else if ((classCrossLink = getCrossClassLink(refClassName,
  2.1037 -                        refMemName, label, false, "", ! isplaintext)) != null) {
  2.1038 -                    //Class cross link found (possiblly to a member in the class)
  2.1039 -                    result.append(classCrossLink);
  2.1040 +                        refMemName, label, false, "", !plain)) != null) {
  2.1041 +                    //Class cross link found (possibly to a member in the class)
  2.1042 +                    return classCrossLink;
  2.1043                  } else {
  2.1044                      //No cross link found so print warning
  2.1045                      configuration.getDocletSpecificMsg().warning(see.position(), "doclet.see.class_or_package_not_found",
  2.1046                              tagName, seetext);
  2.1047 -                    result.append((label.length() == 0)? text: label);
  2.1048 +                    return (label.isEmpty() ? text: label);
  2.1049                  }
  2.1050              }
  2.1051          } else if (refMemName == null) {
  2.1052              // Must be a class reference since refClass is not null and refMemName is null.
  2.1053 -            if (label.length() == 0) {
  2.1054 -                label = (isplaintext) ? refClass.name() : getCode() + refClass.name() + getCodeEnd();
  2.1055 -                result.append(getLink(new LinkInfoImpl(refClass, label)));
  2.1056 -            } else {
  2.1057 -                result.append(getLink(new LinkInfoImpl(refClass, label)));
  2.1058 +            if (label.isEmpty()) {
  2.1059 +                label = plainOrCodeText(plain, refClass.name());
  2.1060              }
  2.1061 +            return getLink(new LinkInfoImpl(refClass, label));
  2.1062          } else if (refMem == null) {
  2.1063              // Must be a member reference since refClass is not null and refMemName is not null.
  2.1064              // However, refMem is null, so this referenced member does not exist.
  2.1065 -            result.append((label.length() == 0)? text: label);
  2.1066 +            return (label.isEmpty() ? text: label);
  2.1067          } else {
  2.1068              // Must be a member reference since refClass is not null and refMemName is not null.
  2.1069              // refMem is not null, so this @see tag must be referencing a valid member.
  2.1070 @@ -2121,17 +1375,16 @@
  2.1071                      refMemName += ((ExecutableMemberDoc)refMem).signature();
  2.1072                  }
  2.1073              }
  2.1074 -            text = (isplaintext) ?
  2.1075 -                refMemName : getCode() + Util.escapeHtmlChars(refMemName) + getCodeEnd();
  2.1076  
  2.1077 -            result.append(getDocLink(LinkInfoImpl.CONTEXT_SEE_TAG, containing,
  2.1078 -                refMem, (label.length() == 0)? text: label, false));
  2.1079 +            text = plainOrCodeText(plain, Util.escapeHtmlChars(refMemName));
  2.1080 +
  2.1081 +            return getDocLink(LinkInfoImpl.CONTEXT_SEE_TAG, containing,
  2.1082 +                refMem, (label.isEmpty() ? text: label), false);
  2.1083          }
  2.1084 -        return result.toString();
  2.1085      }
  2.1086  
  2.1087 -    public void printInlineComment(Doc doc, Tag tag) {
  2.1088 -        printCommentTags(doc, tag.inlineTags(), false, false);
  2.1089 +    private String plainOrCodeText(boolean plain, String text) {
  2.1090 +        return (plain || text.isEmpty()) ? text : codeText(text);
  2.1091      }
  2.1092  
  2.1093      /**
  2.1094 @@ -2145,10 +1398,6 @@
  2.1095          addCommentTags(doc, tag.inlineTags(), false, false, htmltree);
  2.1096      }
  2.1097  
  2.1098 -    public void printInlineDeprecatedComment(Doc doc, Tag tag) {
  2.1099 -        printCommentTags(doc, tag.inlineTags(), true, false);
  2.1100 -    }
  2.1101 -
  2.1102      /**
  2.1103       * Add the inline deprecated comment.
  2.1104       *
  2.1105 @@ -2160,10 +1409,6 @@
  2.1106          addCommentTags(doc, tag.inlineTags(), true, false, htmltree);
  2.1107      }
  2.1108  
  2.1109 -    public void printSummaryComment(Doc doc) {
  2.1110 -        printSummaryComment(doc, doc.firstSentenceTags());
  2.1111 -    }
  2.1112 -
  2.1113      /**
  2.1114       * Adds the summary content.
  2.1115       *
  2.1116 @@ -2174,10 +1419,6 @@
  2.1117          addSummaryComment(doc, doc.firstSentenceTags(), htmltree);
  2.1118      }
  2.1119  
  2.1120 -    public void printSummaryComment(Doc doc, Tag[] firstSentenceTags) {
  2.1121 -        printCommentTags(doc, firstSentenceTags, false, true);
  2.1122 -    }
  2.1123 -
  2.1124      /**
  2.1125       * Adds the summary content.
  2.1126       *
  2.1127 @@ -2189,23 +1430,10 @@
  2.1128          addCommentTags(doc, firstSentenceTags, false, true, htmltree);
  2.1129      }
  2.1130  
  2.1131 -    public void printSummaryDeprecatedComment(Doc doc) {
  2.1132 -        printCommentTags(doc, doc.firstSentenceTags(), true, true);
  2.1133 -    }
  2.1134 -
  2.1135 -    public void printSummaryDeprecatedComment(Doc doc, Tag tag) {
  2.1136 -        printCommentTags(doc, tag.firstSentenceTags(), true, true);
  2.1137 -    }
  2.1138 -
  2.1139      public void addSummaryDeprecatedComment(Doc doc, Tag tag, Content htmltree) {
  2.1140          addCommentTags(doc, tag.firstSentenceTags(), true, true, htmltree);
  2.1141      }
  2.1142  
  2.1143 -    public void printInlineComment(Doc doc) {
  2.1144 -        printCommentTags(doc, doc.inlineTags(), false, false);
  2.1145 -        p();
  2.1146 -    }
  2.1147 -
  2.1148      /**
  2.1149       * Adds the inline comment.
  2.1150       *
  2.1151 @@ -2216,27 +1444,6 @@
  2.1152          addCommentTags(doc, doc.inlineTags(), false, false, htmltree);
  2.1153      }
  2.1154  
  2.1155 -    public void printInlineDeprecatedComment(Doc doc) {
  2.1156 -        printCommentTags(doc, doc.inlineTags(), true, false);
  2.1157 -    }
  2.1158 -
  2.1159 -    private void printCommentTags(Doc doc, Tag[] tags, boolean depr, boolean first) {
  2.1160 -        if(configuration.nocomment){
  2.1161 -            return;
  2.1162 -        }
  2.1163 -        if (depr) {
  2.1164 -            italic();
  2.1165 -        }
  2.1166 -        String result = commentTagsToString(null, doc, tags, first);
  2.1167 -        print(result);
  2.1168 -        if (depr) {
  2.1169 -            italicEnd();
  2.1170 -        }
  2.1171 -        if (tags.length == 0) {
  2.1172 -            space();
  2.1173 -        }
  2.1174 -    }
  2.1175 -
  2.1176      /**
  2.1177       * Adds the comment tags.
  2.1178       *
  2.1179 @@ -2501,22 +1708,6 @@
  2.1180          }
  2.1181      }
  2.1182  
  2.1183 -    public void printStyleSheetProperties() {
  2.1184 -        String filename = configuration.stylesheetfile;
  2.1185 -        if (filename.length() > 0) {
  2.1186 -            File stylefile = new File(filename);
  2.1187 -            String parent = stylefile.getParent();
  2.1188 -            filename = (parent == null)?
  2.1189 -                filename:
  2.1190 -                filename.substring(parent.length() + 1);
  2.1191 -        } else {
  2.1192 -            filename = "stylesheet.css";
  2.1193 -        }
  2.1194 -        filename = relativePath + filename;
  2.1195 -        link("REL =\"stylesheet\" TYPE=\"text/css\" HREF=\"" +
  2.1196 -                 filename + "\" " + "TITLE=\"Style\"");
  2.1197 -    }
  2.1198 -
  2.1199      /**
  2.1200       * Returns a link to the stylesheet file.
  2.1201       *
  2.1202 @@ -2548,15 +1739,6 @@
  2.1203      }
  2.1204  
  2.1205      /**
  2.1206 -     * Write the annotatation types for the given packageDoc.
  2.1207 -     *
  2.1208 -     * @param packageDoc the package to write annotations for.
  2.1209 -     */
  2.1210 -    public void writeAnnotationInfo(PackageDoc packageDoc) {
  2.1211 -        writeAnnotationInfo(packageDoc, packageDoc.annotations());
  2.1212 -    }
  2.1213 -
  2.1214 -    /**
  2.1215       * Adds the annotatation types for the given packageDoc.
  2.1216       *
  2.1217       * @param packageDoc the package to write annotations for.
  2.1218 @@ -2568,15 +1750,6 @@
  2.1219      }
  2.1220  
  2.1221      /**
  2.1222 -     * Write the annotatation types for the given doc.
  2.1223 -     *
  2.1224 -     * @param doc the doc to write annotations for.
  2.1225 -     */
  2.1226 -    public void writeAnnotationInfo(ProgramElementDoc doc) {
  2.1227 -        writeAnnotationInfo(doc, doc.annotations());
  2.1228 -    }
  2.1229 -
  2.1230 -    /**
  2.1231       * Adds the annotatation types for the given doc.
  2.1232       *
  2.1233       * @param doc the package to write annotations for
  2.1234 @@ -2587,17 +1760,6 @@
  2.1235      }
  2.1236  
  2.1237      /**
  2.1238 -     * Write the annotatation types for the given doc and parameter.
  2.1239 -     *
  2.1240 -     * @param indent the number of spaced to indent the parameters.
  2.1241 -     * @param doc the doc to write annotations for.
  2.1242 -     * @param param the parameter to write annotations for.
  2.1243 -     */
  2.1244 -    public boolean writeAnnotationInfo(int indent, Doc doc, Parameter param) {
  2.1245 -        return writeAnnotationInfo(indent, doc, param.annotations(), false);
  2.1246 -    }
  2.1247 -
  2.1248 -    /**
  2.1249       * Add the annotatation types for the given doc and parameter.
  2.1250       *
  2.1251       * @param indent the number of spaces to indent the parameters.
  2.1252 @@ -2611,16 +1773,6 @@
  2.1253      }
  2.1254  
  2.1255      /**
  2.1256 -     * Write the annotatation types for the given doc.
  2.1257 -     *
  2.1258 -     * @param doc the doc to write annotations for.
  2.1259 -     * @param descList the array of {@link AnnotationDesc}.
  2.1260 -     */
  2.1261 -    private void writeAnnotationInfo(Doc doc, AnnotationDesc[] descList) {
  2.1262 -        writeAnnotationInfo(0, doc, descList, true);
  2.1263 -    }
  2.1264 -
  2.1265 -    /**
  2.1266       * Adds the annotatation types for the given doc.
  2.1267       *
  2.1268       * @param doc the doc to write annotations for.
  2.1269 @@ -2634,26 +1786,6 @@
  2.1270      }
  2.1271  
  2.1272      /**
  2.1273 -     * Write the annotatation types for the given doc.
  2.1274 -     *
  2.1275 -     * @param indent the number of extra spaces to indent the annotations.
  2.1276 -     * @param doc the doc to write annotations for.
  2.1277 -     * @param descList the array of {@link AnnotationDesc}.
  2.1278 -     */
  2.1279 -    private boolean writeAnnotationInfo(int indent, Doc doc, AnnotationDesc[] descList, boolean lineBreak) {
  2.1280 -        List<String> annotations = getAnnotations(indent, descList, lineBreak);
  2.1281 -        if (annotations.size() == 0) {
  2.1282 -            return false;
  2.1283 -        }
  2.1284 -        fontNoNewLine("-1");
  2.1285 -        for (Iterator<String> iter = annotations.iterator(); iter.hasNext();) {
  2.1286 -            print(iter.next());
  2.1287 -        }
  2.1288 -        fontEnd();
  2.1289 -        return true;
  2.1290 -    }
  2.1291 -
  2.1292 -    /**
  2.1293       * Adds the annotatation types for the given doc.
  2.1294       *
  2.1295       * @param indent the number of extra spaces to indent the annotations.

     3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Mon Oct 15 17:07:55 2012 -0700
     3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Tue Oct 16 21:03:36 2012 -0700
     3.3 @@ -60,18 +60,6 @@
     3.4          return Arrays.asList(cd.serializableFields());
     3.5      }
     3.6  
     3.7 -    protected void printTypeLinkNoDimension(Type type) {
     3.8 -        ClassDoc cd = type.asClassDoc();
     3.9 -        //Linking to package private classes in serialized for causes
    3.10 -        //broken links.  Don't link to them.
    3.11 -        if (type.isPrimitive() || cd.isPackagePrivate()) {
    3.12 -            print(type.typeName());
    3.13 -        } else {
    3.14 -            writer.printLink(new LinkInfoImpl(
    3.15 -                LinkInfoImpl.CONTEXT_SERIAL_MEMBER, type));
    3.16 -        }
    3.17 -    }
    3.18 -
    3.19      /**
    3.20       * Return the header for serializable fields section.
    3.21       *

     4.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java	Mon Oct 15 17:07:55 2012 -0700
     4.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java	Tue Oct 16 21:03:36 2012 -0700
     4.3 @@ -166,14 +166,4 @@
     4.4                  method.containingClass().qualifiedName(), method.name());
     4.5          }
     4.6      }
     4.7 -
     4.8 -    protected void printTypeLinkNoDimension(Type type) {
     4.9 -        ClassDoc cd = type.asClassDoc();
    4.10 -        if (type.isPrimitive() || cd.isPackagePrivate()) {
    4.11 -            print(type.typeName());
    4.12 -        } else {
    4.13 -            writer.printLink(new LinkInfoImpl(
    4.14 -                LinkInfoImpl.CONTEXT_SERIAL_MEMBER,type));
    4.15 -        }
    4.16 -    }
    4.17  }

     5.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Mon Oct 15 17:07:55 2012 -0700
     5.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java	Tue Oct 16 21:03:36 2012 -0700
     5.3 @@ -218,16 +218,6 @@
     5.4          printHtmlDocument(null, true, serializedTree);
     5.5      }
     5.6  
     5.7 -    private void tableHeader() {
     5.8 -        tableIndexSummary();
     5.9 -        trBgcolorStyle("#CCCCFF", "TableSubHeadingColor");
    5.10 -    }
    5.11 -
    5.12 -    private void tableFooter() {
    5.13 -        fontEnd();
    5.14 -        thEnd(); trEnd(); tableEnd();
    5.15 -    }
    5.16 -
    5.17      /**
    5.18       * Return an instance of a SerialFieldWriter.
    5.19       *

     6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Mon Oct 15 17:07:55 2012 -0700
     6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Tue Oct 16 21:03:36 2012 -0700
     6.3 @@ -66,18 +66,6 @@
     6.4          super(configuration, path, filename, relpath);
     6.5      }
     6.6  
     6.7 -    public void printTypeSummaryHeader() {
     6.8 -        tdIndex();
     6.9 -        font("-1");
    6.10 -        code();
    6.11 -    }
    6.12 -
    6.13 -    public void printTypeSummaryFooter() {
    6.14 -        codeEnd();
    6.15 -        fontEnd();
    6.16 -        tdEnd();
    6.17 -    }
    6.18 -
    6.19      /**
    6.20       * Add the summary header.
    6.21       *
    6.22 @@ -105,14 +93,6 @@
    6.23          return table;
    6.24      }
    6.25  
    6.26 -    public void printTableHeadingBackground(String str) {
    6.27 -        tableIndexDetail();
    6.28 -        tableHeaderStart("#CCCCFF", 1);
    6.29 -        strong(str);
    6.30 -        tableHeaderEnd();
    6.31 -        tableEnd();
    6.32 -    }
    6.33 -
    6.34      /**
    6.35       * Add the inherited summary header.
    6.36       *
    6.37 @@ -126,19 +106,6 @@
    6.38          mw.addInheritedSummaryLabel(cd, inheritedTree);
    6.39      }
    6.40  
    6.41 -    public void printSummaryFooter(AbstractMemberWriter mw, ClassDoc cd) {
    6.42 -        tableEnd();
    6.43 -        space();
    6.44 -    }
    6.45 -
    6.46 -    public void printInheritedSummaryFooter(AbstractMemberWriter mw, ClassDoc cd) {
    6.47 -        codeEnd();
    6.48 -        summaryRowEnd();
    6.49 -        trEnd();
    6.50 -        tableEnd();
    6.51 -        space();
    6.52 -    }
    6.53 -
    6.54      /**
    6.55       * Add the index comment.
    6.56       *
    6.57 @@ -149,24 +116,6 @@
    6.58          addIndexComment(member, member.firstSentenceTags(), contentTree);
    6.59      }
    6.60  
    6.61 -    protected void printIndexComment(Doc member, Tag[] firstSentenceTags) {
    6.62 -        Tag[] deprs = member.tags("deprecated");
    6.63 -        if (Util.isDeprecated((ProgramElementDoc) member)) {
    6.64 -            strongText("doclet.Deprecated");
    6.65 -            space();
    6.66 -            if (deprs.length > 0) {
    6.67 -                printInlineDeprecatedComment(member, deprs[0]);
    6.68 -            }
    6.69 -            return;
    6.70 -        } else {
    6.71 -            ClassDoc cd = ((ProgramElementDoc)member).containingClass();
    6.72 -            if (cd != null && Util.isDeprecated(cd)) {
    6.73 -                strongText("doclet.Deprecated"); space();
    6.74 -            }
    6.75 -        }
    6.76 -        printSummaryComment(member, firstSentenceTags);
    6.77 -    }
    6.78 -
    6.79      /**
    6.80       * Add the index comment.
    6.81       *
    6.82 @@ -223,18 +172,6 @@
    6.83          addSummaryLinkComment(mw, member, member.firstSentenceTags(), contentTree);
    6.84      }
    6.85  
    6.86 -    public void printSummaryLinkComment(AbstractMemberWriter mw,
    6.87 -                                        ProgramElementDoc member,
    6.88 -                                        Tag[] firstSentenceTags) {
    6.89 -        codeEnd();
    6.90 -        println();
    6.91 -        br();
    6.92 -        printNbsps();
    6.93 -        printIndexComment(member, firstSentenceTags);
    6.94 -        summaryRowEnd();
    6.95 -        trEnd();
    6.96 -    }
    6.97 -
    6.98      /**
    6.99       * Add the summary link comment.
   6.100       *
   6.101 @@ -265,13 +202,6 @@
   6.102          mw.addInheritedSummaryLink(cd, member, linksTree);
   6.103      }
   6.104  
   6.105 -    public void printMemberHeader() {
   6.106 -        hr();
   6.107 -    }
   6.108 -
   6.109 -    public void printMemberFooter() {
   6.110 -    }
   6.111 -
   6.112      /**
   6.113       * Get the document content header tree
   6.114       *

     7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java	Mon Oct 15 17:07:55 2012 -0700
     7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java	Tue Oct 16 21:03:36 2012 -0700
     7.3 @@ -83,48 +83,6 @@
     7.4      public abstract Configuration configuration();
     7.5  
     7.6      /**
     7.7 -     * Print Html Hyper Link.
     7.8 -     *
     7.9 -     * @param link String name of the file.
    7.10 -     * @param where Position of the link in the file. Character '#' is not
    7.11 -     * needed.
    7.12 -     * @param label Tag for the link.
    7.13 -     * @param strong  Boolean that sets label to strong.
    7.14 -     */
    7.15 -    public void printHyperLink(String link, String where,
    7.16 -                               String label, boolean strong) {
    7.17 -        print(getHyperLinkString(link, where, label, strong, "", "", ""));
    7.18 -    }
    7.19 -
    7.20 -    /**
    7.21 -     * Print Html Hyper Link.
    7.22 -     *
    7.23 -     * @param link String name of the file.
    7.24 -     * @param where Position of the link in the file. Character '#' is not
    7.25 -     * needed.
    7.26 -     * @param label Tag for the link.
    7.27 -     */
    7.28 -    public void printHyperLink(String link, String where, String label) {
    7.29 -        printHyperLink(link, where, label, false);
    7.30 -    }
    7.31 -
    7.32 -    /**
    7.33 -     * Print Html Hyper Link.
    7.34 -     *
    7.35 -     * @param link       String name of the file.
    7.36 -     * @param where      Position of the link in the file. Character '#' is not
    7.37 -     * needed.
    7.38 -     * @param label      Tag for the link.
    7.39 -     * @param strong       Boolean that sets label to strong.
    7.40 -     * @param stylename  String style of text defined in style sheet.
    7.41 -     */
    7.42 -    public void printHyperLink(String link, String where,
    7.43 -                               String label, boolean strong,
    7.44 -                               String stylename) {
    7.45 -        print(getHyperLinkString(link, where, label, strong, stylename, "", ""));
    7.46 -    }
    7.47 -
    7.48 -    /**
    7.49       * Return Html Hyper Link string.
    7.50       *
    7.51       * @param link       String name of the file.
    7.52 @@ -269,15 +227,6 @@
    7.53      }
    7.54  
    7.55      /**
    7.56 -     * Print the name of the package, this class is in.
    7.57 -     *
    7.58 -     * @param cd    ClassDoc.
    7.59 -     */
    7.60 -    public void printPkgName(ClassDoc cd) {
    7.61 -        print(getPkgName(cd));
    7.62 -    }
    7.63 -
    7.64 -    /**
    7.65       * Get the name of the package, this class is in.
    7.66       *
    7.67       * @param cd    ClassDoc.
    7.68 @@ -291,27 +240,6 @@
    7.69          return "";
    7.70      }
    7.71  
    7.72 -    /**
    7.73 -     * Keep track of member details list. Print the definition list start tag
    7.74 -     * if it is not printed yet.
    7.75 -     */
    7.76 -    public void printMemberDetailsListStartTag () {
    7.77 -        if (!getMemberDetailsListPrinted()) {
    7.78 -            dl();
    7.79 -            memberDetailsListPrinted = true;
    7.80 -        }
    7.81 -    }
    7.82 -
    7.83 -    /**
    7.84 -     * Print the definition list end tag if the list start tag was printed.
    7.85 -     */
    7.86 -    public void printMemberDetailsListEndTag () {
    7.87 -        if (getMemberDetailsListPrinted()) {
    7.88 -            dlEnd();
    7.89 -            memberDetailsListPrinted = false;
    7.90 -        }
    7.91 -    }
    7.92 -
    7.93      public boolean getMemberDetailsListPrinted() {
    7.94          return memberDetailsListPrinted;
    7.95      }
    7.96 @@ -345,7 +273,7 @@
    7.97                  head, frameset);
    7.98          Content htmlDocument = new HtmlDocument(htmlDocType,
    7.99                  htmlComment, htmlTree);
   7.100 -        htmlDocument.write(this, true);
   7.101 +        write(htmlDocument);
   7.102      }
   7.103  
   7.104      /**
   7.105 @@ -362,36 +290,6 @@
   7.106          return space;
   7.107      }
   7.108  
   7.109 -    /**
   7.110 -     * Print the closing &lt;/body&gt; and &lt;/html&gt; tags.
   7.111 -     */
   7.112 -    public void printBodyHtmlEnd() {
   7.113 -        println();
   7.114 -        bodyEnd();
   7.115 -        htmlEnd();
   7.116 -    }
   7.117 -
   7.118 -    /**
   7.119 -     * Calls {@link #printBodyHtmlEnd()} method.
   7.120 -     */
   7.121 -    public void printFooter() {
   7.122 -        printBodyHtmlEnd();
   7.123 -    }
   7.124 -
   7.125 -    /**
   7.126 -     * Print closing &lt;/html&gt; tag.
   7.127 -     */
   7.128 -    public void printFrameFooter() {
   7.129 -        htmlEnd();
   7.130 -    }
   7.131 -
   7.132 -    /**
   7.133 -     * Print ten non-breaking spaces("&#38;nbsp;").
   7.134 -     */
   7.135 -    public void printNbsps() {
   7.136 -        print("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
   7.137 -    }
   7.138 -
   7.139      protected String getGeneratedByString() {
   7.140          Calendar calendar = new GregorianCalendar(TimeZone.getDefault());
   7.141          Date today = calendar.getTime();

     8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Mon Oct 15 17:07:55 2012 -0700
     8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Oct 16 21:03:36 2012 -0700
     8.3 @@ -32,7 +32,7 @@
     8.4  
     8.5  /**
     8.6   * Class for the Html format code generation.
     8.7 - * Initilizes PrintWriter with FileWriter, to enable print
     8.8 + * Initializes PrintWriter with FileWriter, to enable print
     8.9   * related methods to generate the code to the named File through FileWriter.
    8.10   *
    8.11   *  <p><b>This is NOT part of any supported API.
    8.12 @@ -44,7 +44,7 @@
    8.13   * @author Atul M Dambalkar
    8.14   * @author Bhavesh Patel (Modified)
    8.15   */
    8.16 -public class HtmlWriter extends PrintWriter {
    8.17 +public class HtmlWriter {
    8.18  
    8.19      /**
    8.20       * Name of the file, to which this writer is writing to.
    8.21 @@ -153,6 +153,8 @@
    8.22  
    8.23      public final Content descfrmInterfaceLabel;
    8.24  
    8.25 +    private final Writer writer;
    8.26 +
    8.27      /**
    8.28       * Constructor.
    8.29       *
    8.30 @@ -169,7 +171,7 @@
    8.31      public HtmlWriter(Configuration configuration,
    8.32                        String path, String filename, String docencoding)
    8.33                        throws IOException, UnsupportedEncodingException {
    8.34 -        super(Util.genWriter(configuration, path, filename, docencoding));
    8.35 +        writer = Util.genWriter(configuration, path, filename, docencoding);
    8.36          this.configuration = configuration;
    8.37          htmlFilename = filename;
    8.38          this.memberDetailsListPrinted = false;
    8.39 @@ -218,6 +220,14 @@
    8.40          descfrmInterfaceLabel = getResource("doclet.Description_From_Interface");
    8.41      }
    8.42  
    8.43 +    public void write(Content c) throws IOException {
    8.44 +        c.write(writer, true);
    8.45 +    }
    8.46 +
    8.47 +    public void close() throws IOException {
    8.48 +        writer.close();
    8.49 +    }
    8.50 +
    8.51      /**
    8.52       * Get the configuration string as a content.
    8.53       *
    8.54 @@ -252,38 +262,6 @@
    8.55      }
    8.56  
    8.57      /**
    8.58 -     * Print &lt;HTML&gt; tag. Add a newline character at the end.
    8.59 -     */
    8.60 -    public void html() {
    8.61 -        println("<HTML lang=\"" + configuration.getLocale().getLanguage() + "\">");
    8.62 -    }
    8.63 -
    8.64 -    /**
    8.65 -     * Print &lt;/HTML&gt; tag. Add a newline character at the end.
    8.66 -     */
    8.67 -    public void htmlEnd() {
    8.68 -        println("</HTML>");
    8.69 -    }
    8.70 -
    8.71 -    /**
    8.72 -     * Print the script code to be embedded before the  &lt;/HEAD&gt; tag.
    8.73 -     */
    8.74 -    protected void printWinTitleScript(String winTitle){
    8.75 -        if(winTitle != null && winTitle.length() > 0) {
    8.76 -            script();
    8.77 -            println("function windowTitle()");
    8.78 -            println("{");
    8.79 -            println("    if (location.href.indexOf('is-external=true') == -1) {");
    8.80 -            println("        parent.document.title=\"" + winTitle + "\";");
    8.81 -            println("    }");
    8.82 -            println("}");
    8.83 -            scriptEnd();
    8.84 -            noScript();
    8.85 -            noScriptEnd();
    8.86 -        }
    8.87 -    }
    8.88 -
    8.89 -    /**
    8.90       * Returns an HtmlTree for the SCRIPT tag.
    8.91       *
    8.92       * @return an HtmlTree for the SCRIPT tag
    8.93 @@ -326,64 +304,6 @@
    8.94      }
    8.95  
    8.96      /**
    8.97 -     * Print the Javascript &lt;SCRIPT&gt; start tag with its type
    8.98 -     * attribute.
    8.99 -     */
   8.100 -    public void script() {
   8.101 -        println("<SCRIPT type=\"text/javascript\">");
   8.102 -    }
   8.103 -
   8.104 -    /**
   8.105 -     * Print the Javascript &lt;/SCRIPT&gt; end tag.
   8.106 -     */
   8.107 -    public void scriptEnd() {
   8.108 -        println("</SCRIPT>");
   8.109 -    }
   8.110 -
   8.111 -    /**
   8.112 -     * Print the Javascript &lt;NOSCRIPT&gt; start tag.
   8.113 -     */
   8.114 -    public void noScript() {
   8.115 -        println("<NOSCRIPT>");
   8.116 -    }
   8.117 -
   8.118 -    /**
   8.119 -     * Print the Javascript &lt;/NOSCRIPT&gt; end tag.
   8.120 -     */
   8.121 -    public void noScriptEnd() {
   8.122 -        println("</NOSCRIPT>");
   8.123 -    }
   8.124 -
   8.125 -    /**
   8.126 -     * Return the Javascript call to be embedded in the &lt;BODY&gt; tag.
   8.127 -     * Return nothing if winTitle is empty.
   8.128 -     * @return the Javascript call to be embedded in the &lt;BODY&gt; tag.
   8.129 -     */
   8.130 -    protected String getWindowTitleOnload(){
   8.131 -        if(winTitle != null && winTitle.length() > 0) {
   8.132 -            return " onload=\"windowTitle();\"";
   8.133 -        } else {
   8.134 -            return "";
   8.135 -        }
   8.136 -    }
   8.137 -
   8.138 -    /**
   8.139 -     * Print &lt;BODY BGCOLOR="bgcolor"&gt;, including JavaScript
   8.140 -     * "onload" call to load windowtitle script.  This script shows the name
   8.141 -     * of the document in the window title bar when frames are on.
   8.142 -     *
   8.143 -     * @param bgcolor Background color.
   8.144 -     * @param includeScript  boolean set true if printing windowtitle script
   8.145 -     */
   8.146 -    public void body(String bgcolor, boolean includeScript) {
   8.147 -        print("<BODY BGCOLOR=\"" + bgcolor + "\"");
   8.148 -        if (includeScript) {
   8.149 -            print(getWindowTitleOnload());
   8.150 -        }
   8.151 -        println(">");
   8.152 -    }
   8.153 -
   8.154 -    /**
   8.155       * Returns an HtmlTree for the BODY tag.
   8.156       *
   8.157       * @param includeScript  set true if printing windowtitle script
   8.158 @@ -406,31 +326,6 @@
   8.159      }
   8.160  
   8.161      /**
   8.162 -     * Print &lt;/BODY&gt; tag. Add a newline character at the end.
   8.163 -     */
   8.164 -    public void bodyEnd() {
   8.165 -        println("</BODY>");
   8.166 -    }
   8.167 -
   8.168 -    /**
   8.169 -     * Print &lt;TITLE&gt; tag. Add a newline character at the end.
   8.170 -     */
   8.171 -    public void title() {
   8.172 -        println("<TITLE>");
   8.173 -    }
   8.174 -
   8.175 -    /**
   8.176 -     * Print &lt;TITLE&gt; tag. Add a newline character at the end.
   8.177 -     *
   8.178 -     * @param winTitle The title of this document.
   8.179 -     */
   8.180 -    public void title(String winTitle) {
   8.181 -        // Set window title string which is later printed
   8.182 -        this.winTitle = winTitle;
   8.183 -        title();
   8.184 -    }
   8.185 -
   8.186 -    /**
   8.187       * Returns an HtmlTree for the TITLE tag.
   8.188       *
   8.189       * @return an HtmlTree for the TITLE tag
   8.190 @@ -441,295 +336,6 @@
   8.191      }
   8.192  
   8.193      /**
   8.194 -     * Print &lt;/TITLE&gt; tag. Add a newline character at the end.
   8.195 -     */
   8.196 -    public void titleEnd() {
   8.197 -        println("</TITLE>");
   8.198 -    }
   8.199 -
   8.200 -    /**
   8.201 -     * Print &lt;UL&gt; tag. Add a newline character at the end.
   8.202 -     */
   8.203 -    public void ul() {
   8.204 -        println("<UL>");
   8.205 -    }
   8.206 -
   8.207 -    /**
   8.208 -     * Print &lt;/UL&gt; tag. Add a newline character at the end.
   8.209 -     */
   8.210 -    public void ulEnd() {
   8.211 -        println("</UL>");
   8.212 -    }
   8.213 -
   8.214 -    /**
   8.215 -     * Print &lt;LI&gt; tag.
   8.216 -     */
   8.217 -    public void li() {
   8.218 -        print("<LI>");
   8.219 -    }
   8.220 -
   8.221 -    /**
   8.222 -     * Print &lt;LI TYPE="type"&gt; tag.
   8.223 -     *
   8.224 -     * @param type Type string.
   8.225 -     */
   8.226 -    public void li(String type) {
   8.227 -        print("<LI TYPE=\"" + type + "\">");
   8.228 -    }
   8.229 -
   8.230 -    /**
   8.231 -     * Print &lt;H1&gt; tag. Add a newline character at the end.
   8.232 -     */
   8.233 -    public void h1() {
   8.234 -        println("<H1>");
   8.235 -    }
   8.236 -
   8.237 -    /**
   8.238 -     * Print &lt;/H1&gt; tag. Add a newline character at the end.
   8.239 -     */
   8.240 -    public void h1End() {
   8.241 -        println("</H1>");
   8.242 -    }
   8.243 -
   8.244 -    /**
   8.245 -     * Print text with &lt;H1&gt; tag. Also adds &lt;/H1&gt; tag. Add a newline character
   8.246 -     * at the end of the text.
   8.247 -     *
   8.248 -     * @param text Text to be printed with &lt;H1&gt; format.
   8.249 -     */
   8.250 -    public void h1(String text) {
   8.251 -        h1();
   8.252 -        println(text);
   8.253 -        h1End();
   8.254 -    }
   8.255 -
   8.256 -    /**
   8.257 -     * Print &lt;H2&gt; tag. Add a newline character at the end.
   8.258 -     */
   8.259 -    public void h2() {
   8.260 -        println("<H2>");
   8.261 -    }
   8.262 -
   8.263 -    /**
   8.264 -     * Print text with &lt;H2&gt; tag. Also adds &lt;/H2&gt; tag. Add a newline character
   8.265 -     *  at the end of the text.
   8.266 -     *
   8.267 -     * @param text Text to be printed with &lt;H2&gt; format.
   8.268 -     */
   8.269 -    public void h2(String text) {
   8.270 -        h2();
   8.271 -        println(text);
   8.272 -        h2End();
   8.273 -    }
   8.274 -
   8.275 -    /**
   8.276 -     * Print &lt;/H2&gt; tag. Add a newline character at the end.
   8.277 -     */
   8.278 -    public void h2End() {
   8.279 -        println("</H2>");
   8.280 -    }
   8.281 -
   8.282 -    /**
   8.283 -     * Print &lt;H3&gt; tag. Add a newline character at the end.
   8.284 -     */
   8.285 -    public void h3() {
   8.286 -        println("<H3>");
   8.287 -    }
   8.288 -
   8.289 -    /**
   8.290 -     * Print text with &lt;H3&gt; tag. Also adds &lt;/H3&gt; tag. Add a newline character
   8.291 -     *  at the end of the text.
   8.292 -     *
   8.293 -     * @param text Text to be printed with &lt;H3&gt; format.
   8.294 -     */
   8.295 -    public void h3(String text) {
   8.296 -        h3();
   8.297 -        println(text);
   8.298 -        h3End();
   8.299 -    }
   8.300 -
   8.301 -    /**
   8.302 -     * Print &lt;/H3&gt; tag. Add a newline character at the end.
   8.303 -     */
   8.304 -    public void h3End() {
   8.305 -        println("</H3>");
   8.306 -    }
   8.307 -
   8.308 -    /**
   8.309 -     * Print &lt;H4&gt; tag. Add a newline character at the end.
   8.310 -     */
   8.311 -    public void h4() {
   8.312 -        println("<H4>");
   8.313 -    }
   8.314 -
   8.315 -    /**
   8.316 -     * Print &lt;/H4&gt; tag. Add a newline character at the end.
   8.317 -     */
   8.318 -    public void h4End() {
   8.319 -        println("</H4>");
   8.320 -    }
   8.321 -
   8.322 -    /**
   8.323 -     * Print text with &lt;H4&gt; tag. Also adds &lt;/H4&gt; tag. Add a newline character
   8.324 -     * at the end of the text.
   8.325 -     *
   8.326 -     * @param text Text to be printed with &lt;H4&gt; format.
   8.327 -     */
   8.328 -    public void h4(String text) {
   8.329 -        h4();
   8.330 -        println(text);
   8.331 -        h4End();
   8.332 -    }
   8.333 -
   8.334 -    /**
   8.335 -     * Print &lt;H5&gt; tag. Add a newline character at the end.
   8.336 -     */
   8.337 -    public void h5() {
   8.338 -        println("<H5>");
   8.339 -    }
   8.340 -
   8.341 -    /**
   8.342 -     * Print &lt;/H5&gt; tag. Add a newline character at the end.
   8.343 -     */
   8.344 -    public void h5End() {
   8.345 -        println("</H5>");
   8.346 -    }
   8.347 -
   8.348 -    /**
   8.349 -     * Print HTML &lt;IMG SRC="imggif" WIDTH="width" HEIGHT="height" ALT="imgname&gt;
   8.350 -     * tag. It prepends the "images" directory name to the "imggif". This
   8.351 -     * method is used for oneone format generation. Add a newline character
   8.352 -     * at the end.
   8.353 -     *
   8.354 -     * @param imggif   Image GIF file.
   8.355 -     * @param imgname  Image name.
   8.356 -     * @param width    Width of the image.
   8.357 -     * @param height   Height of the image.
   8.358 -     */
   8.359 -    public void img(String imggif, String imgname, int width, int height) {
   8.360 -        println("<IMG SRC=\"images/" + imggif + ".gif\""
   8.361 -              + " WIDTH=\"" + width + "\" HEIGHT=\"" + height
   8.362 -              + "\" ALT=\"" + imgname + "\">");
   8.363 -    }
   8.364 -
   8.365 -    /**
   8.366 -     * Print &lt;MENU&gt; tag. Add a newline character at the end.
   8.367 -     */
   8.368 -    public void menu() {
   8.369 -        println("<MENU>");
   8.370 -    }
   8.371 -
   8.372 -    /**
   8.373 -     * Print &lt;/MENU&gt; tag. Add a newline character at the end.
   8.374 -     */
   8.375 -    public void menuEnd() {
   8.376 -        println("</MENU>");
   8.377 -    }
   8.378 -
   8.379 -    /**
   8.380 -     * Print &lt;PRE&gt; tag. Add a newline character at the end.
   8.381 -     */
   8.382 -    public void pre() {
   8.383 -        println("<PRE>");
   8.384 -    }
   8.385 -
   8.386 -    /**
   8.387 -     * Print &lt;PRE&gt; tag without adding new line character at th eend.
   8.388 -     */
   8.389 -    public void preNoNewLine() {
   8.390 -        print("<PRE>");
   8.391 -    }
   8.392 -
   8.393 -    /**
   8.394 -     * Print &lt;/PRE&gt; tag. Add a newline character at the end.
   8.395 -     */
   8.396 -    public void preEnd() {
   8.397 -        println("</PRE>");
   8.398 -    }
   8.399 -
   8.400 -    /**
   8.401 -     * Print &lt;HR&gt; tag. Add a newline character at the end.
   8.402 -     */
   8.403 -    public void hr() {
   8.404 -        println("<HR>");
   8.405 -    }
   8.406 -
   8.407 -    /**
   8.408 -     * Print &lt;HR SIZE="size" WIDTH="widthpercent%"&gt; tag. Add a newline
   8.409 -     * character at the end.
   8.410 -     *
   8.411 -     * @param size           Size of the ruler.
   8.412 -     * @param widthPercent   Percentage Width of the ruler
   8.413 -     */
   8.414 -    public void hr(int size, int widthPercent) {
   8.415 -        println("<HR SIZE=\"" + size + "\" WIDTH=\"" + widthPercent + "%\">");
   8.416 -    }
   8.417 -
   8.418 -    /**
   8.419 -     * Print &lt;HR SIZE="size" NOSHADE&gt; tag. Add a newline character at the end.
   8.420 -     *
   8.421 -     * @param size           Size of the ruler.
   8.422 -     * @param noshade        noshade string.
   8.423 -     */
   8.424 -    public void hr(int size, String noshade) {
   8.425 -        println("<HR SIZE=\"" + size + "\" NOSHADE>");
   8.426 -    }
   8.427 -
   8.428 -    /**
   8.429 -     * Get the "&lt;STRONG&gt;" string.
   8.430 -     *
   8.431 -     * @return String Return String "&lt;STRONG&gt;";
   8.432 -     */
   8.433 -    public String getStrong() {
   8.434 -        return "<STRONG>";
   8.435 -    }
   8.436 -
   8.437 -    /**
   8.438 -     * Get the "&lt;/STRONG&gt;" string.
   8.439 -     *
   8.440 -     * @return String Return String "&lt;/STRONG&gt;";
   8.441 -     */
   8.442 -    public String getStrongEnd() {
   8.443 -        return "</STRONG>";
   8.444 -    }
   8.445 -
   8.446 -    /**
   8.447 -     * Print &lt;STRONG&gt; tag.
   8.448 -     */
   8.449 -    public void strong() {
   8.450 -        print("<STRONG>");
   8.451 -    }
   8.452 -
   8.453 -    /**
   8.454 -     * Print &lt;/STRONG&gt; tag.
   8.455 -     */
   8.456 -    public void strongEnd() {
   8.457 -        print("</STRONG>");
   8.458 -    }
   8.459 -
   8.460 -    /**
   8.461 -     * Print text passed, in strong format using &lt;STRONG&gt; and &lt;/STRONG&gt; tags.
   8.462 -     *
   8.463 -     * @param text String to be printed in between &lt;STRONG&gt; and &lt;/STRONG&gt; tags.
   8.464 -     */
   8.465 -    public void strong(String text) {
   8.466 -        strong();
   8.467 -        print(text);
   8.468 -        strongEnd();
   8.469 -    }
   8.470 -
   8.471 -    /**
   8.472 -     * Print text passed, in Italics using &lt;I&gt; and &lt;/I&gt; tags.
   8.473 -     *
   8.474 -     * @param text String to be printed in between &lt;I&gt; and &lt;/I&gt; tags.
   8.475 -     */
   8.476 -    public void italics(String text) {
   8.477 -        print("<I>");
   8.478 -        print(text);
   8.479 -        println("</I>");
   8.480 -    }
   8.481 -
   8.482 -    /**
   8.483       * Return, text passed, with Italics &lt;i&gt; and &lt;/i&gt; tags, surrounding it.
   8.484       * So if the text passed is "Hi", then string returned will be "&lt;i&gt;Hi&lt;/i&gt;".
   8.485       *
   8.486 @@ -744,690 +350,16 @@
   8.487      }
   8.488  
   8.489      /**
   8.490 -     * Print "&#38;nbsp;", non-breaking space.
   8.491 -     */
   8.492 -    public void space() {
   8.493 -        print("&nbsp;");
   8.494 -    }
   8.495 -
   8.496 -    /**
   8.497       * Return "&#38;nbsp;", non-breaking space.
   8.498       */
   8.499      public Content getSpace() {
   8.500          return RawHtml.nbsp;
   8.501      }
   8.502  
   8.503 -    /**
   8.504 -     * Print &lt;DL&gt; tag. Add a newline character at the end.
   8.505 -     */
   8.506 -    public void dl() {
   8.507 -        println("<DL>");
   8.508 -    }
   8.509 -
   8.510 -    /**
   8.511 -     * Print &lt;/DL&gt; tag. Add a newline character at the end.
   8.512 -     */
   8.513 -    public void dlEnd() {
   8.514 -        println("</DL>");
   8.515 -    }
   8.516 -
   8.517 -    /**
   8.518 -     * Print &lt;DT&gt; tag.
   8.519 -     */
   8.520 -    public void dt() {
   8.521 -        print("<DT>");
   8.522 -    }
   8.523 -
   8.524 -    /**
   8.525 -     * Print &lt;/DT&gt; tag.
   8.526 -     */
   8.527 -    public void dtEnd() {
   8.528 -        print("</DT>");
   8.529 -    }
   8.530 -
   8.531 -    /**
   8.532 -     * Print &lt;DD&gt; tag.
   8.533 -     */
   8.534 -    public void dd() {
   8.535 -        print("<DD>");
   8.536 -    }
   8.537 -
   8.538 -    /**
   8.539 -     * Print &lt;/DD&gt; tag. Add a newline character at the end.
   8.540 -     */
   8.541 -    public void ddEnd() {
   8.542 -        println("</DD>");
   8.543 -    }
   8.544 -
   8.545 -    /**
   8.546 -     * Print &lt;SUP&gt; tag. Add a newline character at the end.
   8.547 -     */
   8.548 -    public void sup() {
   8.549 -        println("<SUP>");
   8.550 -    }
   8.551 -
   8.552 -    /**
   8.553 -     * Print &lt;/SUP&gt; tag. Add a newline character at the end.
   8.554 -     */
   8.555 -    public void supEnd() {
   8.556 -        println("</SUP>");
   8.557 -    }
   8.558 -
   8.559 -    /**
   8.560 -     * Print &lt;FONT SIZE="size"&gt; tag. Add a newline character at the end.
   8.561 -     *
   8.562 -     * @param size String size.
   8.563 -     */
   8.564 -    public void font(String size) {
   8.565 -        println("<FONT SIZE=\"" + size + "\">");
   8.566 -    }
   8.567 -
   8.568 -    /**
   8.569 -     * Print &lt;FONT SIZE="size"&gt; tag.
   8.570 -     *
   8.571 -     * @param size String size.
   8.572 -     */
   8.573 -    public void fontNoNewLine(String size) {
   8.574 -        print("<FONT SIZE=\"" + size + "\">");
   8.575 -    }
   8.576 -
   8.577 -    /**
   8.578 -     * Print &lt;FONT CLASS="stylename"&gt; tag. Add a newline character at the end.
   8.579 -     *
   8.580 -     * @param stylename String stylename.
   8.581 -     */
   8.582 -    public void fontStyle(String stylename) {
   8.583 -        print("<FONT CLASS=\"" + stylename + "\">");
   8.584 -    }
   8.585 -
   8.586 -    /**
   8.587 -     * Print &lt;FONT SIZE="size" CLASS="stylename"&gt; tag. Add a newline character
   8.588 -     * at the end.
   8.589 -     *
   8.590 -     * @param size String size.
   8.591 -     * @param stylename String stylename.
   8.592 -     */
   8.593 -    public void fontSizeStyle(String size, String stylename) {
   8.594 -        println("<FONT size=\"" + size + "\" CLASS=\"" + stylename + "\">");
   8.595 -    }
   8.596 -
   8.597 -    /**
   8.598 -     * Print &lt;/FONT&gt; tag.
   8.599 -     */
   8.600 -    public void fontEnd() {
   8.601 -        print("</FONT>");
   8.602 -    }
   8.603 -
   8.604 -    /**
   8.605 -     * Get the "&lt;FONT COLOR="color"&gt;" string.
   8.606 -     *
   8.607 -     * @param color String color.
   8.608 -     * @return String Return String "&lt;FONT COLOR="color"&gt;".
   8.609 -     */
   8.610 -    public String getFontColor(String color) {
   8.611 -        return "<FONT COLOR=\"" + color + "\">";
   8.612 -    }
   8.613 -
   8.614 -    /**
   8.615 -     * Get the "&lt;/FONT&gt;" string.
   8.616 -     *
   8.617 -     * @return String Return String "&lt;/FONT&gt;";
   8.618 -     */
   8.619 -    public String getFontEnd() {
   8.620 -        return "</FONT>";
   8.621 -    }
   8.622 -
   8.623 -    /**
   8.624 -     * Print &lt;CENTER&gt; tag. Add a newline character at the end.
   8.625 -     */
   8.626 -    public void center() {
   8.627 -        println("<CENTER>");
   8.628 -    }
   8.629 -
   8.630 -    /**
   8.631 -     * Print &lt;/CENTER&gt; tag. Add a newline character at the end.
   8.632 -     */
   8.633 -    public void centerEnd() {
   8.634 -        println("</CENTER>");
   8.635 -    }
   8.636 -
   8.637 -    /**
   8.638 -     * Print anchor &lt;A NAME="name"&gt; tag.
   8.639 -     *
   8.640 -     * @param name Name String.
   8.641 -     */
   8.642 -    public void aName(String name) {
   8.643 -        print("<A NAME=\"" + name + "\">");
   8.644 -    }
   8.645 -
   8.646 -    /**
   8.647 -     * Print &lt;/A&gt; tag.
   8.648 -     */
   8.649 -    public void aEnd() {
   8.650 -        print("</A>");
   8.651 -    }
   8.652 -
   8.653 -    /**
   8.654 -     * Print &lt;I&gt; tag.
   8.655 -     */
   8.656 -    public void italic() {
   8.657 -        print("<I>");
   8.658 -    }
   8.659 -
   8.660 -    /**
   8.661 -     * Print &lt;/I&gt; tag.
   8.662 -     */
   8.663 -    public void italicEnd() {
   8.664 -        print("</I>");
   8.665 -    }
   8.666 -
   8.667 -    /**
   8.668 -     * Print contents within anchor &lt;A NAME="name"&gt; tags.
   8.669 -     *
   8.670 -     * @param name String name.
   8.671 -     * @param content String contents.
   8.672 -     */
   8.673 -    public void anchor(String name, String content) {
   8.674 -        aName(name);
   8.675 -        print(content);
   8.676 -        aEnd();
   8.677 -    }
   8.678 -
   8.679 -    /**
   8.680 -     * Print anchor &lt;A NAME="name"&gt; and &lt;/A&gt;tags. Print comment string
   8.681 -     * "&lt;!-- --&gt;" within those tags.
   8.682 -     *
   8.683 -     * @param name String name.
   8.684 -     */
   8.685 -    public void anchor(String name) {
   8.686 -        anchor(name, "<!-- -->");
   8.687 -    }
   8.688 -
   8.689 -    /**
   8.690 -     * Print newline and then print &lt;P&gt; tag. Add a newline character at the
   8.691 -     * end.
   8.692 -     */
   8.693 -    public void p() {
   8.694 -        println();
   8.695 -        println("<P>");
   8.696 -    }
   8.697 -
   8.698 -    /**
   8.699 -     * Print newline and then print &lt;/P&gt; tag. Add a newline character at the
   8.700 -     * end.
   8.701 -     */
   8.702 -    public void pEnd() {
   8.703 -        println();
   8.704 -        println("</P>");
   8.705 -    }
   8.706 -
   8.707 -    /**
   8.708 -     * Print newline and then print &lt;BR&gt; tag. Add a newline character at the
   8.709 -     * end.
   8.710 -     */
   8.711 -    public void br() {
   8.712 -        println();
   8.713 -        println("<BR>");
   8.714 -    }
   8.715 -
   8.716 -    /**
   8.717 -     * Print &lt;ADDRESS&gt; tag. Add a newline character at the end.
   8.718 -     */
   8.719 -    public void address() {
   8.720 -        println("<ADDRESS>");
   8.721 -    }
   8.722 -
   8.723 -    /**
   8.724 -     * Print &lt;/ADDRESS&gt; tag. Add a newline character at the end.
   8.725 -     */
   8.726 -    public void addressEnd() {
   8.727 -        println("</ADDRESS>");
   8.728 -    }
   8.729 -
   8.730 -    /**
   8.731 -     * Print &lt;HEAD&gt; tag. Add a newline character at the end.
   8.732 -     */
   8.733 -    public void head() {
   8.734 -        println("<HEAD>");
   8.735 -    }
   8.736 -
   8.737 -    /**
   8.738 -     * Print &lt;/HEAD&gt; tag. Add a newline character at the end.
   8.739 -     */
   8.740 -    public void headEnd() {
   8.741 -        println("</HEAD>");
   8.742 -    }
   8.743 -
   8.744 -    /**
   8.745 -     * Print &lt;CODE&gt; tag.
   8.746 -     */
   8.747 -    public void code() {
   8.748 -        print("<CODE>");
   8.749 -    }
   8.750 -
   8.751 -    /**
   8.752 -     * Print &lt;/CODE&gt; tag.
   8.753 -     */
   8.754 -    public void codeEnd() {
   8.755 -        print("</CODE>");
   8.756 -    }
   8.757 -
   8.758 -    /**
   8.759 -     * Print &lt;EM&gt; tag. Add a newline character at the end.
   8.760 -     */
   8.761 -    public void em() {
   8.762 -        println("<EM>");
   8.763 -    }
   8.764 -
   8.765 -    /**
   8.766 -     * Print &lt;/EM&gt; tag. Add a newline character at the end.
   8.767 -     */
   8.768 -    public void emEnd() {
   8.769 -        println("</EM>");
   8.770 -    }
   8.771 -
   8.772 -    /**
   8.773 -     * Print HTML &lt;TABLE BORDER="border" WIDTH="width"
   8.774 -     * CELLPADDING="cellpadding" CELLSPACING="cellspacing"&gt; tag.
   8.775 -     *
   8.776 -     * @param border       Border size.
   8.777 -     * @param width        Width of the table.
   8.778 -     * @param cellpadding  Cellpadding for the table cells.
   8.779 -     * @param cellspacing  Cellspacing for the table cells.
   8.780 -     */
   8.781 -    public void table(int border, String width, int cellpadding,
   8.782 -                      int cellspacing) {
   8.783 -        println(DocletConstants.NL +
   8.784 -                "<TABLE BORDER=\"" + border +
   8.785 -                "\" WIDTH=\"" + width +
   8.786 -                "\" CELLPADDING=\"" + cellpadding +
   8.787 -                "\" CELLSPACING=\"" + cellspacing +
   8.788 -                "\" SUMMARY=\"\">");
   8.789 -    }
   8.790 -
   8.791 -    /**
   8.792 -     * Print HTML &lt;TABLE BORDER="border" WIDTH="width"
   8.793 -     * CELLPADDING="cellpadding" CELLSPACING="cellspacing" SUMMARY="summary"&gt; tag.
   8.794 -     *
   8.795 -     * @param border       Border size.
   8.796 -     * @param width        Width of the table.
   8.797 -     * @param cellpadding  Cellpadding for the table cells.
   8.798 -     * @param cellspacing  Cellspacing for the table cells.
   8.799 -     * @param summary      Table summary.
   8.800 -     */
   8.801 -    public void table(int border, String width, int cellpadding,
   8.802 -                      int cellspacing, String summary) {
   8.803 -        println(DocletConstants.NL +
   8.804 -                "<TABLE BORDER=\"" + border +
   8.805 -                "\" WIDTH=\"" + width +
   8.806 -                "\" CELLPADDING=\"" + cellpadding +
   8.807 -                "\" CELLSPACING=\"" + cellspacing +
   8.808 -                "\" SUMMARY=\"" + summary + "\">");
   8.809 -    }
   8.810 -
   8.811 -    /**
   8.812 -     * Print HTML &lt;TABLE BORDER="border" CELLPADDING="cellpadding"
   8.813 -     * CELLSPACING="cellspacing"&gt; tag.
   8.814 -     *
   8.815 -     * @param border       Border size.
   8.816 -     * @param cellpadding  Cellpadding for the table cells.
   8.817 -     * @param cellspacing  Cellspacing for the table cells.
   8.818 -     */
   8.819 -    public void table(int border, int cellpadding, int cellspacing) {
   8.820 -        println(DocletConstants.NL +
   8.821 -                "<TABLE BORDER=\"" + border +
   8.822 -                "\" CELLPADDING=\"" + cellpadding +
   8.823 -                "\" CELLSPACING=\"" + cellspacing +
   8.824 -                "\" SUMMARY=\"\">");
   8.825 -    }
   8.826 -
   8.827 -    /**
   8.828 -     * Print HTML &lt;TABLE BORDER="border" CELLPADDING="cellpadding"
   8.829 -     * CELLSPACING="cellspacing" SUMMARY="summary"&gt; tag.
   8.830 -     *
   8.831 -     * @param border       Border size.
   8.832 -     * @param cellpadding  Cellpadding for the table cells.
   8.833 -     * @param cellspacing  Cellspacing for the table cells.
   8.834 -     * @param summary      Table summary.
   8.835 -     */
   8.836 -    public void table(int border, int cellpadding, int cellspacing, String summary) {
   8.837 -        println(DocletConstants.NL +
   8.838 -                "<TABLE BORDER=\"" + border +
   8.839 -                "\" CELLPADDING=\"" + cellpadding +
   8.840 -                "\" CELLSPACING=\"" + cellspacing +
   8.841 -                "\" SUMMARY=\"" + summary + "\">");
   8.842 -    }
   8.843 -
   8.844 -    /**
   8.845 -     * Print HTML &lt;TABLE BORDER="border" WIDTH="width"&gt;
   8.846 -     *
   8.847 -     * @param border       Border size.
   8.848 -     * @param width        Width of the table.
   8.849 -     */
   8.850 -    public void table(int border, String width) {
   8.851 -        println(DocletConstants.NL +
   8.852 -                "<TABLE BORDER=\"" + border +
   8.853 -                "\" WIDTH=\"" + width +
   8.854 -                "\" SUMMARY=\"\">");
   8.855 -    }
   8.856 -
   8.857 -    /**
   8.858 -     * Print the HTML table tag with border size 0 and width 100%.
   8.859 -     */
   8.860 -    public void table() {
   8.861 -        table(0, "100%");
   8.862 -    }
   8.863 -
   8.864 -    /**
   8.865 -     * Print &lt;/TABLE&gt; tag. Add a newline character at the end.
   8.866 -     */
   8.867 -    public void tableEnd() {
   8.868 -        println("</TABLE>");
   8.869 -    }
   8.870 -
   8.871 -    /**
   8.872 -     * Print &lt;TR&gt; tag. Add a newline character at the end.
   8.873 -     */
   8.874 -    public void tr() {
   8.875 -        println("<TR>");
   8.876 -    }
   8.877 -
   8.878 -    /**
   8.879 -     * Print &lt;/TR&gt; tag. Add a newline character at the end.
   8.880 -     */
   8.881 -    public void trEnd() {
   8.882 -        println("</TR>");
   8.883 -    }
   8.884 -
   8.885 -    /**
   8.886 -     * Print &lt;TD&gt; tag.
   8.887 -     */
   8.888 -    public void td() {
   8.889 -        print("<TD>");
   8.890 -    }
   8.891 -
   8.892 -    /**
   8.893 -     * Print &lt;TD NOWRAP&gt; tag.
   8.894 -     */
   8.895 -    public void tdNowrap() {
   8.896 -        print("<TD NOWRAP>");
   8.897 -    }
   8.898 -
   8.899 -    /**
   8.900 -     * Print &lt;TD WIDTH="width"&gt; tag.
   8.901 -     *
   8.902 -     * @param width String width.
   8.903 -     */
   8.904 -    public void tdWidth(String width) {
   8.905 -        print("<TD WIDTH=\"" + width + "\">");
   8.906 -    }
   8.907 -
   8.908 -    /**
   8.909 -     * Print &lt;/TD&gt; tag. Add a newline character at the end.
   8.910 -     */
   8.911 -    public void tdEnd() {
   8.912 -        println("</TD>");
   8.913 -    }
   8.914 -
   8.915 -    /**
   8.916 -     * Print &lt;LINK str&gt; tag.
   8.917 -     *
   8.918 -     * @param str String.
   8.919 -     */
   8.920 -    public void link(String str) {
   8.921 -        println("<LINK " + str + ">");
   8.922 -    }
   8.923 -
   8.924 -    /**
   8.925 -     * Print "&lt;!-- " comment start string.
   8.926 -     */
   8.927 -    public void commentStart() {
   8.928 -         print("<!-- ");
   8.929 -    }
   8.930 -
   8.931 -    /**
   8.932 -     * Print "--&gt;" comment end string. Add a newline character at the end.
   8.933 -     */
   8.934 -    public void commentEnd() {
   8.935 -         println("-->");
   8.936 -    }
   8.937 -
   8.938 -    /**
   8.939 -     * Print &lt;CAPTION CLASS="stylename"&gt; tag. Adds a newline character
   8.940 -     * at the end.
   8.941 -     *
   8.942 -     * @param stylename style to be applied.
   8.943 -     */
   8.944 -    public void captionStyle(String stylename) {
   8.945 -        println("<CAPTION CLASS=\"" + stylename + "\">");
   8.946 -    }
   8.947 -
   8.948 -    /**
   8.949 -     * Print &lt;/CAPTION&gt; tag. Add a newline character at the end.
   8.950 -     */
   8.951 -    public void captionEnd() {
   8.952 -        println("</CAPTION>");
   8.953 -    }
   8.954 -
   8.955 -    /**
   8.956 -     * Print &lt;TR BGCOLOR="color" CLASS="stylename"&gt; tag. Adds a newline character
   8.957 -     * at the end.
   8.958 -     *
   8.959 -     * @param color String color.
   8.960 -     * @param stylename String stylename.
   8.961 -     */
   8.962 -    public void trBgcolorStyle(String color, String stylename) {
   8.963 -        println("<TR BGCOLOR=\"" + color + "\" CLASS=\"" + stylename + "\">");
   8.964 -    }
   8.965 -
   8.966 -    /**
   8.967 -     * Print &lt;TR BGCOLOR="color"&gt; tag. Adds a newline character at the end.
   8.968 -     *
   8.969 -     * @param color String color.
   8.970 -     */
   8.971 -    public void trBgcolor(String color) {
   8.972 -        println("<TR BGCOLOR=\"" + color + "\">");
   8.973 -    }
   8.974 -
   8.975 -    /**
   8.976 -     * Print &lt;TR ALIGN="align" VALIGN="valign"&gt; tag. Adds a newline character
   8.977 -     * at the end.
   8.978 -     *
   8.979 -     * @param align String align.
   8.980 -     * @param valign String valign.
   8.981 -     */
   8.982 -    public void trAlignVAlign(String align, String valign) {
   8.983 -        println("<TR ALIGN=\"" + align + "\" VALIGN=\"" + valign + "\">");
   8.984 -    }
   8.985 -
   8.986 -    /**
   8.987 -     * Print &lt;TH ALIGN="align"&gt; tag.
   8.988 -     *
   8.989 -     * @param align the align attribute.
   8.990 -     */
   8.991 -    public void thAlign(String align) {
   8.992 -        print("<TH ALIGN=\"" + align + "\">");
   8.993 -    }
   8.994 -
   8.995 -    /**
   8.996 -     * Print &lt;TH CLASS="stylename" SCOPE="scope" NOWRAP&gt; tag.
   8.997 -     *
   8.998 -     * @param stylename style to be applied.
   8.999 -     * @param scope the scope attribute.
  8.1000 -     */
  8.1001 -    public void thScopeNoWrap(String stylename, String scope) {
  8.1002 -        print("<TH CLASS=\"" + stylename + "\" SCOPE=\"" + scope + "\" NOWRAP>");
  8.1003 -    }
  8.1004 -
  8.1005      /*
  8.1006       * Returns a header for Modifier and Type column of a table.
  8.1007       */
  8.1008      public String getModifierTypeHeader() {
  8.1009          return modifierTypeHeader;
  8.1010      }
  8.1011 -
  8.1012 -    /**
  8.1013 -     * Print &lt;TH align="align" COLSPAN=i&gt; tag.
  8.1014 -     *
  8.1015 -     * @param align the align attribute.
  8.1016 -     * @param i integer.
  8.1017 -     */
  8.1018 -    public void thAlignColspan(String align, int i) {
  8.1019 -        print("<TH ALIGN=\"" + align + "\" COLSPAN=\"" + i + "\">");
  8.1020 -    }
  8.1021 -
  8.1022 -    /**
  8.1023 -     * Print &lt;TH align="align" NOWRAP&gt; tag.
  8.1024 -     *
  8.1025 -     * @param align the align attribute.
  8.1026 -     */
  8.1027 -    public void thAlignNowrap(String align) {
  8.1028 -        print("<TH ALIGN=\"" + align + "\" NOWRAP>");
  8.1029 -    }
  8.1030 -
  8.1031 -    /**
  8.1032 -     * Print &lt;/TH&gt; tag. Add a newline character at the end.
  8.1033 -     */
  8.1034 -    public void thEnd() {
  8.1035 -        println("</TH>");
  8.1036 -    }
  8.1037 -
  8.1038 -    /**
  8.1039 -     * Print &lt;TD COLSPAN=i&gt; tag.
  8.1040 -     *
  8.1041 -     * @param i integer.
  8.1042 -     */
  8.1043 -    public void tdColspan(int i) {
  8.1044 -        print("<TD COLSPAN=" + i + ">");
  8.1045 -    }
  8.1046 -
  8.1047 -    /**
  8.1048 -     * Print &lt;TD BGCOLOR="color" CLASS="stylename"&gt; tag.
  8.1049 -     *
  8.1050 -     * @param color String color.
  8.1051 -     * @param stylename String stylename.
  8.1052 -     */
  8.1053 -    public void tdBgcolorStyle(String color, String stylename) {
  8.1054 -        print("<TD BGCOLOR=\"" + color + "\" CLASS=\"" + stylename + "\">");
  8.1055 -    }
  8.1056 -
  8.1057 -    /**
  8.1058 -     * Print &lt;TD COLSPAN=i BGCOLOR="color" CLASS="stylename"&gt; tag.
  8.1059 -     *
  8.1060 -     * @param i integer.
  8.1061 -     * @param color String color.
  8.1062 -     * @param stylename String stylename.
  8.1063 -     */
  8.1064 -    public void tdColspanBgcolorStyle(int i, String color, String stylename) {
  8.1065 -        print("<TD COLSPAN=" + i + " BGCOLOR=\"" + color + "\" CLASS=\"" +
  8.1066 -              stylename + "\">");
  8.1067 -    }
  8.1068 -
  8.1069 -    /**
  8.1070 -     * Print &lt;TD ALIGN="align"&gt; tag. Adds a newline character
  8.1071 -     * at the end.
  8.1072 -     *
  8.1073 -     * @param align String align.
  8.1074 -     */
  8.1075 -    public void tdAlign(String align) {
  8.1076 -        print("<TD ALIGN=\"" + align + "\">");
  8.1077 -    }
  8.1078 -
  8.1079 -    /**
  8.1080 -     * Print &lt;TD ALIGN="align" CLASS="stylename"&gt; tag.
  8.1081 -     *
  8.1082 -     * @param align        String align.
  8.1083 -     * @param stylename    String stylename.
  8.1084 -     */
  8.1085 -    public void tdVAlignClass(String align, String stylename) {
  8.1086 -        print("<TD VALIGN=\"" + align + "\" CLASS=\"" + stylename + "\">");
  8.1087 -    }
  8.1088 -
  8.1089 -    /**
  8.1090 -     * Print &lt;TD VALIGN="valign"&gt; tag.
  8.1091 -     *
  8.1092 -     * @param valign String valign.
  8.1093 -     */
  8.1094 -    public void tdVAlign(String valign) {
  8.1095 -        print("<TD VALIGN=\"" + valign + "\">");
  8.1096 -    }
  8.1097 -
  8.1098 -    /**
  8.1099 -     * Print &lt;TD ALIGN="align" VALIGN="valign"&gt; tag.
  8.1100 -     *
  8.1101 -     * @param align   String align.
  8.1102 -     * @param valign  String valign.
  8.1103 -     */
  8.1104 -    public void tdAlignVAlign(String align, String valign) {
  8.1105 -        print("<TD ALIGN=\"" + align + "\" VALIGN=\"" + valign + "\">");
  8.1106 -    }
  8.1107 -
  8.1108 -    /**
  8.1109 -     * Print &lt;TD ALIGN="align" ROWSPAN=rowspan&gt; tag.
  8.1110 -     *
  8.1111 -     * @param align    String align.
  8.1112 -     * @param rowspan  integer rowspan.
  8.1113 -     */
  8.1114 -    public void tdAlignRowspan(String align, int rowspan) {
  8.1115 -        print("<TD ALIGN=\"" + align + "\" ROWSPAN=" + rowspan + ">");
  8.1116 -    }
  8.1117 -
  8.1118 -    /**
  8.1119 -     * Print &lt;TD ALIGN="align" VALIGN="valign" ROWSPAN=rowspan&gt; tag.
  8.1120 -     *
  8.1121 -     * @param align    String align.
  8.1122 -     * @param valign  String valign.
  8.1123 -     * @param rowspan  integer rowspan.
  8.1124 -     */
  8.1125 -    public void tdAlignVAlignRowspan(String align, String valign,
  8.1126 -                                     int rowspan) {
  8.1127 -        print("<TD ALIGN=\"" + align + "\" VALIGN=\"" + valign
  8.1128 -                + "\" ROWSPAN=" + rowspan + ">");
  8.1129 -    }
  8.1130 -
  8.1131 -    /**
  8.1132 -     * Print &lt;BLOCKQUOTE&gt; tag. Add a newline character at the end.
  8.1133 -     */
  8.1134 -    public void blockquote() {
  8.1135 -        println("<BLOCKQUOTE>");
  8.1136 -    }
  8.1137 -
  8.1138 -    /**
  8.1139 -     * Print &lt;/BLOCKQUOTE&gt; tag. Add a newline character at the end.
  8.1140 -     */
  8.1141 -    public void blockquoteEnd() {
  8.1142 -        println("</BLOCKQUOTE>");
  8.1143 -    }
  8.1144 -
  8.1145 -    /**
  8.1146 -     * Get the "&lt;code&gt;" string.
  8.1147 -     *
  8.1148 -     * @return String Return String "&lt;code&gt;";
  8.1149 -     */
  8.1150 -    public String getCode() {
  8.1151 -        return "<code>";
  8.1152 -    }
  8.1153 -
  8.1154 -    /**
  8.1155 -     * Get the "&lt;/code&gt;" string.
  8.1156 -     *
  8.1157 -     * @return String Return String "&lt;/code&gt;";
  8.1158 -     */
  8.1159 -    public String getCodeEnd() {
  8.1160 -        return "</code>";
  8.1161 -    }
  8.1162 -
  8.1163 -    /**
  8.1164 -     * Print &lt;NOFRAMES&gt; tag. Add a newline character at the end.
  8.1165 -     */
  8.1166 -    public void noFrames() {
  8.1167 -        println("<NOFRAMES>");
  8.1168 -    }
  8.1169 -
  8.1170 -    /**
  8.1171 -     * Print &lt;/NOFRAMES&gt; tag. Add a newline character at the end.
  8.1172 -     */
  8.1173 -    public void noFramesEnd() {
  8.1174 -        println("</NOFRAMES>");
  8.1175 -    }
  8.1176  }

     9.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java	Mon Oct 15 17:07:55 2012 -0700
     9.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java	Tue Oct 16 21:03:36 2012 -0700
     9.3 @@ -153,7 +153,7 @@
     9.4       *
     9.5       * @param contentTree content tree that will be printed as a document
     9.6       */
     9.7 -    public void printDocument(Content contentTree) throws IOException ;
     9.8 +    public void printDocument(Content contentTree) throws IOException;
     9.9  
    9.10      /**
    9.11       * Close the writer.

src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java		file \| annotate \| diff \| comparison \| revisions
src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java		file \| annotate \| diff \| comparison \| revisions

Mercurial > jdk8-mips64-public > langtools / changeset

changeset

8000673: remove dead code from HtmlWriter and subtypes