jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java

-:7ee1fd365cdd
+:f1b90ea7d402
 package com.sun.tools.doclets.formats.html.markup;
 import java.io.*;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import com.sun.tools.doclets.internal.toolkit.*;
 import com.sun.tools.doclets.internal.toolkit.util.*;
 /**
 configuration.getText("doclet.packages"));
 modifierTypeHeader = configuration.getText("doclet.0_and_1",
 configuration.getText("doclet.Modifier"),
 configuration.getText("doclet.Type"));
 overviewLabel = getResource("doclet.Overview");
-defaultPackageLabel = new RawHtml(
+defaultPackageLabel = new StringContent(DocletConstants.DEFAULT_PACKAGE_NAME);
-DocletConstants.DEFAULT_PACKAGE_NAME);
 packageLabel = getResource("doclet.Package");
 profileLabel = getResource("doclet.Profile");
 useLabel = getResource("doclet.navClassUse");
 prevLabel = getResource("doclet.Prev");
 nextLabel = getResource("doclet.Next");
 *
 * @param key the key to look for in the configuration file
 * @return a content tree for the text
 */
 public Content getResource(String key) {
-return new StringContent(configuration.getText(key));
+return configuration.getResource(key);
 }
 /**
 * Get the configuration string as a content.
 *
 * @param key the key to look for in the configuration file
-* @param a1 string argument added to configuration text
+* @param o   string or content argument added to configuration text
 * @return a content tree for the text
 */
-public Content getResource(String key, String a1) {
+public Content getResource(String key, Object o) {
-return new RawHtml(configuration.getText(key, a1));
+return configuration.getResource(key, o);
 }
 /**
 * Get the configuration string as a content.
 *
 * @param key the key to look for in the configuration file
-* @param a1 string argument added to configuration text
+* @param o1  string or content argument added to configuration text
-* @param a2 string argument added to configuration text
+* @param o2  string or content argument added to configuration text
 * @return a content tree for the text
 */
-public Content getResource(String key, String a1, String a2) {
+public Content getResource(String key, Object o0, Object o1) {
-return new RawHtml(configuration.getText(key, a1, a2));
+return configuration.getResource(key, o0, o1);
 }
 /**
 * Returns an HtmlTree for the SCRIPT tag.
 *
 /**
 * Returns a content tree for the SCRIPT tag for the main page(index.html).
 *
 * @return a content for the SCRIPT tag
 */
-protected Content getFramesetJavaScript(){
+protected Content getFramesetJavaScript() {
 HtmlTree script = new HtmlTree(HtmlTag.SCRIPT);
 script.addAttr(HtmlAttr.TYPE, "text/javascript");
-String scriptCode = DocletConstants.NL + "    targetPage = \"\" + window.location.search;" + DocletConstants.NL +
+String scriptCode = DocletConstants.NL +
+"    targetPage = \"\" + window.location.search;" + DocletConstants.NL +
 "    if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
 "        targetPage = targetPage.substring(1);" + DocletConstants.NL +
 "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
 "        targetPage = \"undefined\";" + DocletConstants.NL +
 "    function validURL(url) {" + DocletConstants.NL +
 public HtmlTree getTitle() {
 HtmlTree title = HtmlTree.TITLE(new StringContent(winTitle));
 return title;
 }
-/**
-* Return, text passed, with Italics &lt;i&gt; and &lt;/i&gt; tags, surrounding it.
-* So if the text passed is "Hi", then string returned will be "&lt;i&gt;Hi&lt;/i&gt;".
-*
-* @param text String to be printed in between &lt;I&gt; and &lt;/I&gt; tags.
-*/
-public String italicsText(String text) {
-return "<i>" + text + "</i>";
-}
 public String codeText(String text) {
 return "<code>" + text + "</code>";
 }
 /**

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

comparison: src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java

src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java