stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4749567: stddoclet: Add CSS style for setting header/footer to be italic

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Bhavesh Patel 2013-08-07 16:09:31 -07:00
parent 69a3c42db7
commit a8090b5024
6 changed files with 108 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
View File

@ -316,7 +316,7 @@ public class HelpWriter extends HtmlDocletWriter {
liConst.addContent(constPara);
ul.addContent(liConst);
Content divContent = HtmlTree.DIV(HtmlStyle.contentContainer, ul);
Content line30 = HtmlTree.EM(getResource("doclet.Help_line_30"));
Content line30 = HtmlTree.SPAN(HtmlStyle.italic, getResource("doclet.Help_line_30"));
divContent.addContent(line30);
contentTree.addContent(divContent);
}

3
langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
View File

@ -467,8 +467,7 @@ public class HtmlDocletWriter extends HtmlDocWriter {
}
}
Content rawContent = new RawHtml(content);
Content em = HtmlTree.EM(rawContent);
return em;
return rawContent;
}
/**

11
langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
View File

@ -281,17 +281,6 @@ public class HtmlTree extends Content {
return htmltree;
}
/**
* Generates a EM tag with some content.
*
* @param body content to be added to the tag
* @return an HtmlTree object for the EM tag
*/
public static HtmlTree EM(Content body) {
HtmlTree htmltree = new HtmlTree(HtmlTag.EM, nullCheck(body));
return htmltree;
}
/**
* Generates a FRAME tag.
*

1
langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
View File

@ -77,6 +77,7 @@ Document title and Copyright styles
float:right;
padding:0px 21px;
font-size:.8em;
font-style:italic;
z-index:200;
margin-top:-7px;
}

78
langtools/test/com/sun/javadoc/testOptions/TestOptions.java Normal file
View File

@ -0,0 +1,78 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 4749567
* @summary Test the output for -header and -footer options.
* @author Bhavesh Patel
* @library ../lib/
* @build JavadocTester TestOptions
* @run main TestOptions
*/
public class TestOptions extends JavadocTester {
//Test information.
private static final String BUG_ID = "4749567";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-header", "Test header", "-footer", "Test footer",
"-sourcepath", SRC_DIR, "pkg"
};
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
"<div class=\"aboutLanguage\">Test header</div>"},
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
"<div class=\"aboutLanguage\">Test footer</div>"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
/**
* The entry point of the test.
* @param args the array of command line arguments.
*/
public static void main(String[] args) {
TestOptions tester = new TestOptions();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

27
langtools/test/com/sun/javadoc/testOptions/pkg/Foo.java Normal file
View File

@ -0,0 +1,27 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package pkg;
public class Foo {}