Skip to content

D
dragonwell8_langtools

openanolis / dragonwell8_langtools

通知 0
Star 2
Fork 0
D
dragonwell8_langtools
提交 a99c4831 编写于 作者: B bpatel
浏览文件
操作

7052425: Change the look and feel of the javadoc generate HTML pages using stylesheet 

Reviewed-by: jjg
上级 867a66be
隐藏空白更改
内联 并排
Showing with 351 addition and 303 deletion
src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
浏览文件 @ a99c4831
...@@ -110,7 +110,10 @@ public class HtmlDoclet extends AbstractDoclet { ...@@ -110,7 +110,10 @@ public class HtmlDoclet extends AbstractDoclet {
String configstylefile = configuration.stylesheetfile; String configstylefile = configuration.stylesheetfile;
performCopy(configdestdir, confighelpfile); performCopy(configdestdir, confighelpfile);
performCopy(configdestdir, configstylefile); performCopy(configdestdir, configstylefile);
Util.copyResourceFile(configuration, "inherit.gif", false); Util.copyResourceFile(configuration, "background.gif", false);
Util.copyResourceFile(configuration, "tab.gif", false);
Util.copyResourceFile(configuration, "titlebar.gif", false);
Util.copyResourceFile(configuration, "titlebar_end.gif", false);
// do early to reduce memory footprint // do early to reduce memory footprint
if (configuration.classuse) { if (configuration.classuse) {
ClassUseWriter.generate(configuration, classtree); ClassUseWriter.generate(configuration, classtree);
......
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
浏览文件 @ a99c4831
...@@ -3,187 +3,290 @@ ...@@ -3,187 +3,290 @@
Overall document style Overall document style
*/ */
body { body {
font-family:Helvetica, Arial, sans-serif; background-color:#ffffff;
color:#000000; color:#353833;
font-family:Arial, Helvetica, sans-serif;
font-size:76%;
margin:0;
}
a:link, a:visited {
text-decoration:none;
color:#4c6b87;
}
a:hover, a:focus {
text-decoration:none;
color:#bb7a2a;
}
a:active {
text-decoration:none;
color:#4c6b87;
}
a[name] {
color:#353833;
}
a[name]:hover {
text-decoration:none;
color:#353833;
} }
pre { pre {
font-size:1.0em; font-size:1.3em;
} }
h1 { h1 {
font-size:1.4em; font-size:1.8em;
} }
h2 { h2 {
font-size:1.35em; font-size:1.5em;
} }
h3 { h3 {
font-size:1.3em; font-size:1.4em;
} }
h4 { h4 {
font-size:1.25em; font-size:1.3em;
}
h5 {
font-size:1.2em;
}
h6 {
font-size:1.1em;
} }
ul { ul {
margin:10px 0 10px 20px;
list-style-type:disc; list-style-type:disc;
} }
caption { code, tt {
background: #CCCCFF; font-size:1.2em;
color:#000000; }
text-align:left; dt code {
font-size:150%; font-size:1.2em;
font-weight:bold; }
border-left:2px ridge; table tr td dt code {
border-right:2px ridge; font-size:1.2em;
border-top:2px ridge; vertical-align:top;
padding-left:5px; }
width:auto; sup {
font-size:.6em;
} }
/* /*
Document title and Copyright styles Document title and Copyright styles
*/ */
.clear {
clear:both;
height:0px;
overflow:hidden;
}
.aboutLanguage { .aboutLanguage {
float:right; float:right;
font-size:0.9em; padding:0px 21px;
color:#000000; font-size:.8em;
z-index:200;
margin-top:-7px;
} }
.legalCopy { .legalCopy {
margin:7px 0; margin-left:.5em;
} }
.bar { .bar a, .bar a:link, .bar a:visited, .bar a:active {
font-size:1em; color:#FFFFFF;
margin:10px 0 0 2px; text-decoration:none;
}
.bar a:hover, .bar a:focus {
color:#bb7a2a;
} }
.bar a { .tab {
font-weight:normal; background-color:#0066FF;
background-image:url(resources/titlebar.gif);
background-position:left top;
background-repeat:no-repeat;
color:#ffffff;
padding:8px;
width:5em;
font-weight:bold;
} }
/* /*
Navigation bar styles Navigation bar styles
*/ */
.bar {
background-image:url(resources/background.gif);
background-repeat:repeat-x;
color:#FFFFFF;
padding:.8em .5em .4em .8em;
height:auto;/*height:1.8em;*/
font-size:1em;
margin:0;
}
.topNav { .topNav {
border-top:2px solid #C0C0C0; background-image:url(resources/background.gif);
padding:7px 0; background-repeat:repeat-x;
height:2.8em; color:#FFFFFF;
float:left;
padding:0;
width:100%; width:100%;
min-width:600px; clear:right;
height:2.8em;
padding-top:10px;
overflow:hidden;
} }
.bottomNav { .bottomNav {
border-top:2px solid #C0C0C0; margin-top:10px;
padding:7px 0; background-image:url(resources/background.gif);
height:2.8em; background-repeat:repeat-x;
color:#FFFFFF;
float:left;
padding:0;
width:100%; width:100%;
clear:right;
height:2.8em;
padding-top:10px;
overflow:hidden;
} }
.subNav { .subNav {
border-bottom:2px solid #C0C0C0; background-color:#dee3e9;
border-bottom:1px solid #9eadc0;
float:left; float:left;
width:100%; width:100%;
min-width:600px; overflow:hidden;
} }
.subNav div { .subNav div {
clear:left; clear:left;
float:left; float:left;
padding:0 0 5px 2px; padding:0 0 5px 6px;
width:100%;
} }
.topNav a:link,.topNav a:active, .topNav a:visited, .topNav a:hover, ul.navList, ul.subNavList {
.bottomNav a:link,.bottomNav a:active, .bottomNav a:visited, .bottomNav a:hover {
color:#000000;
font-weight:bold;
text-decoration:underline;
font-size:1em;
}
/* Navigation bar list styles */
.topNav ul.navList, .bottomNav ul.navList {
background-color:#EEEEFF;
padding:4px 4px;
margin:0;
float:left; float:left;
width:80%; margin:0 25px 0 0;
padding:0;
} }
ul.navList li{ ul.navList li{
list-style:none; list-style:none;
float:left; float:left;
padding:0 4px; padding:3px 6px;
color:#000000;
font-size:0.98em;
}
ul.navList li.navBarCell1Rev {
background-color:#00008B;
color:#FFFFFF;
font-weight:bold;
font-size:0.97em;
}
/* Sub-navigation bar list styles */
.subNav ul.navList {
float:left;
margin:0;
padding:0;
font-size:0.8em;
width:350px;
}
ul.subNavList {
float:left;
font-size:0.8em;
width:350px;
margin:0;
padding:0;
} }
ul.subNavList li{ ul.subNavList li{
list-style:none; list-style:none;
float:left; float:left;
font-size:98%; font-size:90%;
}
.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
color:#FFFFFF;
text-decoration:none;
}
.topNav a:hover, .bottomNav a:hover {
text-decoration:none;
color:#bb7a2a;
}
.navBarCell1Rev {
background-image:url(resources/tab.gif);
background-color:#a88834;
color:#FFFFFF;
margin: auto 5px;
border:1px solid #c9aa44;
} }
/* /*
Page header and footer styles Page header and footer styles
*/ */
.header, .footer { .header, .footer {
clear:both; clear:both;
padding:10px 0; margin:0 20px;
padding:5px 0 0 0;
} }
.indexHeader { .indexHeader {
font-size:0.9em; margin:10px;
margin:10px 0 0 2px; position:relative;
}
.header ul {
padding-left:20px;
} }
/* Header and footer title styles */ .indexHeader h1 {
.header h1.title { font-size:1.3em;
font-size:1.4em;
text-align:center;
margin:0;
} }
.header h2.title { .title {
font-size:1.35em; color:#2c4557;
margin:0; margin:10px 0;
} }
.subTitle { .subTitle {
padding-top:10px; margin:5px 0 0 0;
}
.header ul {
margin:0 0 25px 0;
padding:0;
}
.footer ul {
margin:20px 0 5px 0;
}
.header ul li, .footer ul li {
list-style:none;
font-size:1.2em;
} }
/* /*
Content styles Heading styles
*/ */
.deprecatedContent { div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
margin:0; background-color:#dee3e9;
padding:10px 0; border-top:1px solid #9eadc0;
border-bottom:1px solid #9eadc0;
margin:0 0 6px -8px;
padding:2px 5px;
}
ul.blockList ul.blockList ul.blockList li.blockList h3 {
background-color:#dee3e9;
border-top:1px solid #9eadc0;
border-bottom:1px solid #9eadc0;
margin:0 0 6px -8px;
padding:2px 5px;
}
ul.blockList ul.blockList li.blockList h3 {
padding:0;
margin:15px 0;
} }
.docSummary { ul.blockList li.blockList h2 {
padding-top:10px; padding:0px 0 20px 0;
} }
/* /*
Page layout container styles Page layout container styles
*/ */
.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
.constantValuesContainer {
clear:both; clear:both;
padding:10px 20px;
position:relative; position:relative;
padding-bottom:20px;
} }
.indexContainer { .indexContainer {
padding:0 0 0 2px; margin:10px;
font-size:0.9em; position:relative;
font-size:1.0em;
}
.indexContainer h2 {
font-size:1.1em;
padding:0 0 3px 0;
}
.indexContainer ul {
margin:0;
padding:0;
}
.indexContainer ul li {
list-style:none;
}
.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
font-size:1.1em;
font-weight:bold;
margin:10px 0 0 0;
color:#4E4E4E;
}
.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
margin:10px 0 10px 20px;
}
.serializedFormContainer dl.nameValue dt {
margin-left:1px;
font-size:1.1em;
display:inline;
font-weight:bold;
}
.serializedFormContainer dl.nameValue dd {
margin:0 0 0 1px;
font-size:1.1em;
display:inline;
} }
/* /*
Class inheritance information styles List styles
*/ */
ul.horizontal li {
display:inline;
font-size:0.9em;
}
ul.inheritance { ul.inheritance {
margin:0; margin:0;
padding:0; padding:0;
...@@ -194,236 +297,178 @@ ul.inheritance li { ...@@ -194,236 +297,178 @@ ul.inheritance li {
} }
ul.inheritance li ul.inheritance { ul.inheritance li ul.inheritance {
margin-left:15px; margin-left:15px;
background-image:url(resources/inherit.gif);
background-repeat:no-repeat;
padding-left:15px; padding-left:15px;
padding-top:1px; padding-top:1px;
} }
/* ul.blockList, ul.blockListLast {
Heading styles margin:10px 0 10px 0;
*/ padding:0;
.indexContainer h2 {
font-weight:normal;
font-size:1.0em;
padding:5px 0 0 0;
margin:10px 0 0 0;
} }
.contentContainer h2 { ul.blockList li.blockList, ul.blockListLast li.blockList {
margin:10px 0; list-style:none;
margin-bottom:25px;
} }
.constantValuesContainer h2 { ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
background:#CCCCFF; padding:0px 20px 5px 10px;
border:2px ridge; border:1px solid #9eadc0;
padding:3px; background-color:#f9f9f9;
margin:0 0 10px 0;
}
.serializedFormContainer ul.blockList li.blockList h2 {
background:#EEEEFF;
border:2px ridge;
padding:3px;
margin:0 0 15px 0;
text-align:center;
}
.classUseContainer ul li ul li h3 {
margin-bottom:30px;
padding:3px;
}
.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList h3 {
background:#EEEEFF;
margin:0 0 15px 0;
padding:3px;
}
.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList h3 {
background:#CCCCFF;
margin:0 0 15px 0;
padding:3px;
border:2px ridge;
}
ul.blockList ul.blockList li.blockList h3, ul.blockList ul.blockList li.blockList h3 {
background:#CCCCFF;
border:2px ridge;
padding-left:5px;
}
div.summary ul.blockList ul.blockList li.blockList h3 {
background:#CCCCFF;
border:0;
border:2px ridge;
margin:0;
} }
div.summary ul.blockList ul.blockList ul.blockList li.blockList h3 { ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
background:#EEEEFF; padding:0 0 5px 8px;
border:0; background-color:#ffffff;
border-bottom:2px ridge; border:1px solid #9eadc0;
border-top:none;
} }
div.details ul.blockList ul.blockList ul.blockList li.blockList h4, ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { margin-left:0;
font-size:1.15em; padding-left:0;
font-weight:bold; padding-bottom:15px;
padding:0 0 5px 0; border:none;
margin:0; border-bottom:1px solid #9eadc0;
}
ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
list-style:none;
border-bottom:none;
padding-bottom:0;
}
table tr td dl, table tr td dl dt, table tr td dl dd {
margin-top:0;
margin-bottom:1px;
} }
/* /*
Table styles Table styles
*/ */
.contentContainer table { .contentContainer table, .classUseContainer table, .constantValuesContainer table {
border-collapse:collapse ; border-bottom:1px solid #9eadc0;
width:100%; width:100%;
} }
.contentContainer table td, .contentContainer table th { .contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table {
border:2px ridge;
}
/* Constant values page table styles */
.constantValuesContainer table {
border-collapse:collapse;
}
.constantValuesContainer table caption{
font-size:0.95em;
padding:3px;
background:#EEEEFF;
}
.constantValuesContainer table td, .constantValuesContainer table th {
border:2px ridge;
padding:3px;
}
/* Class-use/Package-use page table styles */
.classUseContainer table {
border-collapse:collapse ;
width:100%; width:100%;
margin:0 0 10px 0;
} }
.classUseContainer ul li ul li table caption{ .contentContainer .description table, .contentContainer .details table {
font-size:0.95em; border-bottom:none;
padding:3px;
background:#EEEEFF;
}
.classUseContainer table td, .classUseContainer table th {
border:2px ridge;
padding:3px;
}
/* Summary table styles */
ul.blockList li.blockList table.overviewSummary {
margin:0;
margin-bottom:15px;
}
ul.blockList li.blockList table caption {
padding:3px;
}
ul.blockList li.blockList table.overviewSummary td.colFirst{
text-align:right;
}
table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
width:15%;
}
div.summary ul.blockList ul.blockList li.blockList caption {
display:none;
}
div.summary ul.blockList li.blockList ul.blockList li.blockList table.overviewSummary th {
border-top:0;
}
/* Table column block styles */
ul.blockList li.blockList table.overviewSummary td.colLast div.block{
padding:0;
padding-left:40px;
}
ul.blockList li.blockList table.overviewSummary td.colOne div.block{
padding:0;
padding-left:40px;
} }
.contentContainer ul.blockList li.blockList table .colOne div.block{ .contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{
padding-left:40px; vertical-align:top;
padding-right:20px;
} }
.classUseContainer ul li ul li table .colLast div.block, .contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast,
.classUseContainer ul li ul li table .colOne div.block{ .contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast,
padding-left:40px; .contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne,
.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne {
padding-right:3px;
} }
/* .overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption {
List styles position:relative;
*/ text-align:left;
ul.horizontal li { background-repeat:no-repeat;
display:inline; color:#FFFFFF;
font-size:0.9em; font-weight:bold;
clear:none;
overflow:hidden;
padding:0px;
margin:0px;
} }
/* Container specific list styles */ caption a:link, caption a:hover, caption a:active, caption a:visited {
.indexContainer ul { color:#FFFFFF;
margin:0;
padding:0;
} }
.indexContainer ul li { .overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span {
list-style:none; white-space:nowrap;
padding-top:8px;
padding-left:8px;
display:block;
float:left;
background-image:url(resources/titlebar.gif);
height:18px;
} }
.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList { .overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd {
border:0; width:10px;
background-image:url(resources/titlebar_end.gif);
background-repeat:no-repeat;
background-position:top right;
position:relative;
float:left;
} }
.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList { ul.blockList ul.blockList li.blockList table {
list-style:none; margin:0 0 12px 0px;
border:0; width:100%;
border-bottom:2px ridge;
height:1%;
} }
.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast { .tableSubHeadingColor {
list-style:none; background-color: #EEEEFF;
} }
/* General list styles */ .altColor {
ul.blockList, ul.blockListLast { background-color:#eeeeef;
margin-left:0;
padding-left:0;
} }
ul.blockList li.blockList, ul.blockListLast li.blockList { .rowColor {
list-style:none; background-color:#ffffff;
margin-bottom:25px;
} }
ul.blockList ul.blockList ul.blockList li.blockList { .overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td {
border:2px ridge; text-align:left;
padding:3px 3px 3px 7px;
} }
div.details ul.blockList ul.blockList ul.blockList li.blockList { th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
border:0; background:#dee3e9;
border-bottom:2px ridge; border-top:1px solid #9eadc0;
height:1%; border-bottom:1px solid #9eadc0;
text-align:left;
padding:3px 3px 3px 7px;
} }
/* Definition list styles */ td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
ul.blockList li.blockList dl{ font-weight:bold;
margin-bottom:15px;
} }
ul.blockList li.blockList dl dd{ td.colFirst, th.colFirst {
margin:0 0 0 30px; border-left:1px solid #9eadc0;
white-space:nowrap;
} }
ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList dl, td.colLast, th.colLast {
ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList dl{ border-right:1px solid #9eadc0;
padding:0 0 10px 35px;
} }
dl.nameValue dt, dl.nameValue dd{ td.colOne, th.colOne {
display:inline; border-right:1px solid #9eadc0;
border-left:1px solid #9eadc0;
} }
ul.blockList li.blockList pre{ table.overviewSummary {
margin:0 0 15px 0; padding:0px;
margin-left:0px;
} }
.description dl dt { table.overviewSummary td.colFirst, table.overviewSummary th.colFirst,
font-size:0.95em; table.overviewSummary td.colOne, table.overviewSummary th.colOne {
font-weight:bold; width:25%;
margin:5px 0 0 0; vertical-align:middle;
} }
.description dl dd { table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
margin:10px 0 10px 20px; width:25%;
vertical-align:middle;
} }
/* List content styles */ /*
ul.blockList li.blockList ul.blockList li.blockList pre{ Content styles
margin:10px 0 10px 0; */
.description pre {
margin-top:0;
} }
ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList pre, .deprecatedContent {
ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{ margin:0;
padding:0 0 10px 0; padding:10px 0;
} }
ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList div.block, .docSummary {
ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList div.block{ padding:0;
padding:0 0 10px 35px;
} }
/* /*
Formatting effect styles Formatting effect styles
*/ */
.strong {
font-weight:bold;
}
.sourceLineNo { .sourceLineNo {
color:green; color:green;
padding:0 30px 0 0; padding:0 30px 0 0;
} }
h1.hidden {
visibility:hidden;
overflow:hidden;
font-size:.9em;
}
.block {
display:block;
margin:3px 0 0 0;
}
.strong {
font-weight:bold;
}
test/com/sun/javadoc/AccessH1/AccessH1.java
浏览文件 @ a99c4831
/* /*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 4636667 * @bug 4636667 7052425
* @summary Use <H1, <H2>, and <H3> in proper sequence for accessibility * @summary Use <H1, <H2>, and <H3> in proper sequence for accessibility
* @author dkramer * @author dkramer
* @run main AccessH1 * @run main AccessH1
...@@ -42,7 +42,7 @@ import java.io.*; ...@@ -42,7 +42,7 @@ import java.io.*;
*/ */
public class AccessH1 { public class AccessH1 {
private static final String BUGID = "4636667"; private static final String BUGID = "4636667-7052425";
private static final String BUGNAME = "AccessH1"; private static final String BUGNAME = "AccessH1";
private static final String FS = System.getProperty("file.separator"); private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator"); private static final String PS = System.getProperty("path.separator");
...@@ -85,8 +85,7 @@ public class AccessH1 { ...@@ -85,8 +85,7 @@ public class AccessH1 {
private static final String[][] testArray = { private static final String[][] testArray = {
// Test the style sheet // Test the style sheet
{ {
".header h1.title {" + LS + " font-size:1.4em;" + LS + "h1 {" + LS + " font-size:1.8em;" + LS +
" text-align:center;" + LS + " margin:0;" + LS +
"}", "}",
TMPDEST_DIR1 + "stylesheet.css" TMPDEST_DIR1 + "stylesheet.css"
}, },
......
test/com/sun/javadoc/testStylesheet/TestStylesheet.java
浏览文件 @ a99c4831
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 4494033 7028815 * @bug 4494033 7028815 7052425
* @summary Run tests on doclet stylesheet. * @summary Run tests on doclet stylesheet.
* @author jamieh * @author jamieh
* @library ../lib/ * @library ../lib/
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
public class TestStylesheet extends JavadocTester { public class TestStylesheet extends JavadocTester {
//Test information. //Test information.
private static final String BUG_ID = "4494033-7028815"; private static final String BUG_ID = "4494033-7028815-7052425";
//Javadoc arguments. //Javadoc arguments.
private static final String[] ARGS = new String[] { private static final String[] ARGS = new String[] {
...@@ -52,11 +52,12 @@ public class TestStylesheet extends JavadocTester { ...@@ -52,11 +52,12 @@ public class TestStylesheet extends JavadocTester {
{BUG_ID + FS + "stylesheet.css", {BUG_ID + FS + "stylesheet.css",
"/*" + NL + "Navigation bar styles" + NL + "*/"}, "/*" + NL + "Navigation bar styles" + NL + "*/"},
{BUG_ID + FS + "stylesheet.css", {BUG_ID + FS + "stylesheet.css",
"body {" + NL + " font-family:Helvetica, Arial, sans-serif;" + NL + "body {" + NL + " background-color:#ffffff;" + NL +
" color:#000000;" + NL + "}"}, " color:#353833;" + NL +
" font-family:Arial, Helvetica, sans-serif;" + NL +
" font-size:76%;" + NL + " margin:0;" + NL + "}"},
{BUG_ID + FS + "stylesheet.css", {BUG_ID + FS + "stylesheet.css",
"ul {" + NL + " margin:10px 0 10px 20px;" + NL + "ul {" + NL + " list-style-type:disc;" + NL + "}"},
" list-style-type:disc;" + NL + "}"},
// Test whether a link to the stylesheet file is inserted properly // Test whether a link to the stylesheet file is inserted properly
// in the class documentation. // in the class documentation.
{BUG_ID + FS + "pkg" + FS + "A.html", {BUG_ID + FS + "pkg" + FS + "A.html",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或