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

-:bcbc86cc5b31
+:90af8d87741f
 * @param label Tag for the link.
 * @param strong  Boolean that sets label to strong.
 */
 public void printHyperLink(String link, String where,
 String label, boolean strong) {
-print(getHyperLink(link, where, label, strong, "", "", ""));
+print(getHyperLinkString(link, where, label, strong, "", "", ""));
 }
 /**
 * Print Html Hyper Link.
 *
 * @param stylename  String style of text defined in style sheet.
 */
 public void printHyperLink(String link, String where,
 String label, boolean strong,
 String stylename) {
-print(getHyperLink(link, where, label, strong, stylename, "", ""));
+print(getHyperLinkString(link, where, label, strong, stylename, "", ""));
 }
 /**
 * Return Html Hyper Link string.
 *
 * needed.
 * @param label      Tag for the link.
 * @param strong       Boolean that sets label to strong.
 * @return String    Hyper Link.
 */
-public String getHyperLink(String link, String where,
+public String getHyperLinkString(String link, String where,
 String label, boolean strong) {
-return getHyperLink(link, where, label, strong, "", "", "");
+return getHyperLinkString(link, where, label, strong, "", "", "");
 }
 /**
 * Get Html Hyper Link string.
 *
 * @param label      Tag for the link.
 * @param strong       Boolean that sets label to strong.
 * @param stylename  String style of text defined in style sheet.
 * @return String    Hyper Link.
 */
-public String getHyperLink(String link, String where,
+public String getHyperLinkString(String link, String where,
 String label, boolean strong,
 String stylename) {
-return getHyperLink(link, where, label, strong, stylename, "", "");
+return getHyperLinkString(link, where, label, strong, stylename, "", "");
+}
+/**
+* Get Html Hyper Link string.
+*
+* @param link       String name of the file.
+* @param where      Position of the link in the file. Character '#' is not
+*                   needed.
+* @param label      Tag for the link.
+* @return a content tree for the hyper link
+*/
+public Content getHyperLink(String link, String where,
+Content label) {
+return getHyperLink(link, where, label, "", "");
 }
 /**
 * Get Html Hyper Link string.
 *
 * @param stylename  String style of text defined in style sheet.
 * @param title      String that describes the link's content for accessibility.
 * @param target     Target frame.
 * @return String    Hyper Link.
 */
-public String getHyperLink(String link, String where,
+public String getHyperLinkString(String link, String where,
 String label, boolean strong,
 String stylename, String title, String target) {
 StringBuffer retlink = new StringBuffer();
-retlink.append("<A HREF=\"");
+retlink.append("<a href=\"");
 retlink.append(link);
 if (where != null && where.length() != 0) {
 retlink.append("#");
 retlink.append(where);
 }
 retlink.append("<FONT CLASS=\"");
 retlink.append(stylename);
 retlink.append("\">");
 }
 if (strong) {
-retlink.append("<STRONG>");
+retlink.append("<span class=\"strong\">");
 }
 retlink.append(label);
 if (strong) {
-retlink.append("</STRONG>");
+retlink.append("</span>");
 }
 if (stylename != null && stylename.length() != 0) {
 retlink.append("</FONT>");
 }
-retlink.append("</A>");
+retlink.append("</a>");
 return retlink.toString();
 }
 /**
-* Print link without positioning in the file.
+* Get Html Hyper Link.
 *
 * @param link       String name of the file.
-* @param label      Tag for the link.
+* @param where      Position of the link in the file. Character '#' is not
-*/
+*                   needed.
-public void printHyperLink(String link, String label) {
+* @param label      Tag for the link.
-print(getHyperLink(link, "", label, false));
+* @param title      String that describes the link's content for accessibility.
+* @param target     Target frame.
+* @return a content tree for the hyper link.
+*/
+public Content getHyperLink(String link, String where,
+Content label, String title, String target) {
+if (where != null && where.length() != 0) {
+link += "#" + where;
+}
+HtmlTree anchor = HtmlTree.A(link, label);
+if (title != null && title.length() != 0) {
+anchor.addAttr(HtmlAttr.TITLE, title);
+}
+if (target != null && target.length() != 0) {
+anchor.addAttr(HtmlAttr.TARGET, target);
+}
+return anchor;
+}
+/**
+* Get a hyperlink to a file.
+*
+* @param link String name of the file
+* @param label Label for the link
+* @return a content for the hyperlink to the file
+*/
+public Content getHyperLink(String link, Content label) {
+return getHyperLink(link, "", label);
 }
 /**
 * Get link string without positioning in the file.
 *
 * @param link       String name of the file.
 * @param label      Tag for the link.
 * @return Strign    Hyper link.
 */
-public String getHyperLink(String link, String label) {
+public String getHyperLinkString(String link, String label) {
-return getHyperLink(link, "", label, false);
+return getHyperLinkString(link, "", label, false);
 }
 /**
 * Print the name of the package, this class is in.
 *
 /**
 * Print the frameset version of the Html file header.
 * Called only when generating an HTML frameset file.
 *
-* @param title    Title of this HTML document.
+* @param title Title of this HTML document
-*/
+* @param noTimeStamp If true, don't print time stamp in header
-public void printFramesetHeader(String title) {
+* @param frameset the frameset to be added to the HTML document
-printFramesetHeader(title, false);
+*/
-}
+public void printFramesetDocument(String title, boolean noTimeStamp,
+Content frameset) {
-/**
+Content htmlDocType = DocType.Frameset();
-* Print the frameset version of the Html file header.
+Content htmlComment = new Comment(configuration.getText("doclet.New_Page"));
-* Called only when generating an HTML frameset file.
+Content head = new HtmlTree(HtmlTag.HEAD);
-*
-* @param title        Title of this HTML document.
-* @param noTimeStamp  If true, don't print time stamp in header.
-*/
-public void printFramesetHeader(String title, boolean noTimeStamp) {
-println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 " +
-"Frameset//EN\" " +
-"\"http://www.w3.org/TR/html4/frameset.dtd\">");
-println("<!--NewPage-->");
-html();
-head();
 if (! noTimeStamp) {
-print("<!-- Generated by javadoc on ");
+Content headComment = new Comment("Generated by javadoc on " + today());
-print(today());
+head.addContent(headComment);
-println("-->");
 }
 if (configuration.charset.length() > 0) {
-println("<META http-equiv=\"Content-Type\" content=\"text/html; "
+Content meta = HtmlTree.META("Content-Type", "text/html",
-+ "charset=" + configuration.charset + "\">");
+configuration.charset);
-}
+head.addContent(meta);
-title();
+}
-println(title);
+Content windowTitle = HtmlTree.TITLE(new StringContent(title));
-titleEnd();
+head.addContent(windowTitle);
-//Script to set the classFrame if necessary.
+head.addContent(getFramesetJavaScript());
-script();
+Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(),
-println("    targetPage = \"\" + window.location.search;");
+head, frameset);
-println("    if (targetPage != \"\" && targetPage != \"undefined\")");
+Content htmlDocument = new HtmlDocument(htmlDocType,
-println("        targetPage = targetPage.substring(1);");
+htmlComment, htmlTree);
-println("    if (targetPage.indexOf(\":\") != -1)");
+print(htmlDocument.toString());
-println("        targetPage = \"undefined\";");
-println("    function loadFrames() {");
-println("        if (targetPage != \"\" && targetPage != \"undefined\")");
-println("             top.classFrame.location = top.targetPage;");
-println("    }");
-scriptEnd();
-noScript();
-noScriptEnd();
-headEnd();
 }
 /**
 * Print the appropriate spaces to format the class tree in the class page.
 *

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

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

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