changeset 3152:16cf4849ecef

Sync with jdk9/dev: more javadoc syncing.
author wmdietl
date Wed, 15 Jan 2014 13:36:51 -0500
parents 1b8b0cb557fe
children f51d2e966e3c
files src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java
diffstat 2 files changed, 101 insertions(+), 149 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Jan 15 13:33:53 2014 -0500
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Jan 15 13:36:51 2014 -0500
@@ -2,19 +2,16 @@
 /*
 Overall document style
 */
-
-@import url('resources/fonts/dejavu.css');
-
 body {
     background-color:#ffffff;
     color:#353833;
-    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size:14px;
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:76%;
     margin:0;
 }
 a:link, a:visited {
     text-decoration:none;
-    color:#4A6782;
+    color:#4c6b87;
 }
 a:hover, a:focus {
     text-decoration:none;
@@ -22,7 +19,7 @@
 }
 a:active {
     text-decoration:none;
-    color:#4A6782;
+    color:#4c6b87;
 }
 a[name] {
     color:#353833;
@@ -32,51 +29,41 @@
     color:#353833;
 }
 pre {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-size:1.3em;
 }
 h1 {
-    font-size:20px;
+    font-size:1.8em;
 }
 h2 {
-    font-size:18px;
+    font-size:1.5em;
 }
 h3 {
-    font-size:16px;
-    font-style:italic;
+    font-size:1.4em;
 }
 h4 {
-    font-size:13px;
+    font-size:1.3em;
 }
 h5 {
-    font-size:12px;
+    font-size:1.2em;
 }
 h6 {
-    font-size:11px;
+    font-size:1.1em;
 }
 ul {
     list-style-type:disc;
 }
 code, tt {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
-    margin-top:8px;
-    line-height:1.4em;
+    font-size:1.2em;
 }
 dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
+    font-size:1.2em;
 }
 table tr td dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-size:1.2em;
     vertical-align:top;
-    padding-top:4px;
 }
 sup {
-    font-size:8px;
+    font-size:.6em;
 }
 /*
 Document title and Copyright styles
@@ -89,9 +76,10 @@
 .aboutLanguage {
     float:right;
     padding:0px 21px;
-    font-size:11px;
+    font-size:.8em;
+    font-style:italic;
     z-index:200;
-    margin-top:-9px;
+    margin-top:-7px;
 }
 .legalCopy {
     margin-left:.5em;
@@ -105,6 +93,9 @@
 }
 .tab {
     background-color:#0066FF;
+    background-image:url(resources/titlebar.gif);
+    background-position:left top;
+    background-repeat:no-repeat;
     color:#ffffff;
     padding:8px;
     width:5em;
@@ -114,15 +105,17 @@
 Navigation bar styles
 */
 .bar {
-    background-color:#4D7A97;
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
     color:#FFFFFF;
     padding:.8em .5em .4em .8em;
     height:auto;/*height:1.8em;*/
-    font-size:11px;
+    font-size:1em;
     margin:0;
 }
 .topNav {
-    background-color:#4D7A97;
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
     color:#FFFFFF;
     float:left;
     padding:0;
@@ -131,11 +124,11 @@
     height:2.8em;
     padding-top:10px;
     overflow:hidden;
-    font-size:12px; 
 }
 .bottomNav {
     margin-top:10px;
-    background-color:#4D7A97;
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
     color:#FFFFFF;
     float:left;
     padding:0;
@@ -144,20 +137,18 @@
     height:2.8em;
     padding-top:10px;
     overflow:hidden;
-    font-size:12px;
 }
 .subNav {
     background-color:#dee3e9;
+    border-bottom:1px solid #9eadc0;
     float:left;
     width:100%;
     overflow:hidden;
-    font-size:12px;
 }
 .subNav div {
     clear:left;
     float:left;
     padding:0 0 5px 6px;
-    text-transform:uppercase;
 }
 ul.navList, ul.subNavList {
     float:left;
@@ -167,34 +158,34 @@
 ul.navList li{
     list-style:none;
     float:left;
-    padding: 5px 6px;
-    text-transform:uppercase;
+    padding:3px 6px;
 }
 ul.subNavList li{
     list-style:none;
     float:left;
+    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;
-    text-transform:uppercase;
 }
 .topNav a:hover, .bottomNav a:hover {
     text-decoration:none;
     color:#bb7a2a;
-    text-transform:uppercase;
 }
 .navBarCell1Rev {
-    background-color:#F8981D;
-    color:#253441;
+    background-image:url(resources/tab.gif);
+    background-color:#a88834;
+    color:#FFFFFF;
     margin: auto 5px;
+    border:1px solid #c9aa44;
 }
 .skipNav {
     position:absolute;
     top:auto;
     left:-9999px;
     overflow:hidden;
-}
+    }
 /*
 Page header and footer styles
 */
@@ -211,7 +202,7 @@
     margin-right:15px;
 }
 .indexHeader h1 {
-    font-size:13px;
+    font-size:1.3em;
 }
 .title {
     color:#2c4557;
@@ -221,7 +212,7 @@
     margin:5px 0 0 0;
 }
 .header ul {
-    margin:0 0 15px 0;
+    margin:0 0 25px 0;
     padding:0;
 }
 .footer ul {
@@ -229,22 +220,24 @@
 }
 .header ul li, .footer ul li {
     list-style:none;
-    font-size:13px;
+    font-size:1.2em;
 }
 /*
 Heading styles
 */
 div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
     background-color:#dee3e9;
-    border:1px solid #d0d9e0;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
     margin:0 0 6px -8px;
-    padding:7px 5px;
+    padding:2px 5px;
 }
 ul.blockList ul.blockList ul.blockList li.blockList h3 {
     background-color:#dee3e9;
-    border:1px solid #d0d9e0;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
     margin:0 0 6px -8px;
-    padding:7px 5px;
+    padding:2px 5px;
 }
 ul.blockList ul.blockList li.blockList h3 {
     padding:0;
@@ -264,10 +257,10 @@
 .indexContainer {
     margin:10px;
     position:relative;
-    font-size:12px;
+    font-size:1.0em;
 }
 .indexContainer h2 {
-    font-size:13px;
+    font-size:1.1em;
     padding:0 0 3px 0;
 }
 .indexContainer ul {
@@ -276,18 +269,15 @@
 }
 .indexContainer ul li {
     list-style:none;
-    padding-top:2px;
 }
 .contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
-    font-size:12px;
+    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:5px 0 10px 0px;
-    font-size:14px;
-    font-family:'DejaVu Sans Mono',monospace;
+    margin:10px 0 10px 20px;
 }
 .serializedFormContainer dl.nameValue dt {
     margin-left:1px;
@@ -326,24 +316,25 @@
 }
 ul.blockList li.blockList, ul.blockListLast li.blockList {
     list-style:none;
-    margin-bottom:15px;
-    line-height:1.4;
+    margin-bottom:25px;
 }
 ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
     padding:0px 20px 5px 10px;
-    border:1px solid #ededed; 
-    background-color:#f8f8f8;
+    border:1px solid #9eadc0;
+    background-color:#f9f9f9;
 }
 ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
     padding:0 0 5px 8px;
     background-color:#ffffff;
-    border:none;
+    border:1px solid #9eadc0;
+    border-top:none;
 }
 ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
     margin-left:0;
     padding-left:0;
     padding-bottom:15px;
     border:none;
+    border-bottom:1px solid #9eadc0;
 }
 ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
     list-style:none;
@@ -358,10 +349,9 @@
 Table styles
 */
 .overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    border-bottom:1px solid #9eadc0;
+    margin:0 0 12px 0px;
     width:100%;
-    border-left:1px solid #EEE; 
-    border-right:1px solid #EEE; 
-    border-bottom:1px solid #EEE; 
 }
 .overviewSummary, .memberSummary  {
     padding:0px;
@@ -371,15 +361,12 @@
     position:relative;
     text-align:left;
     background-repeat:no-repeat;
-    color:#253441;
+    color:#FFFFFF;
     font-weight:bold;
     clear:none;
     overflow:hidden;
     padding:0px;
-    padding-top:10px;
-    padding-left:1px;
     margin:0px;
-    white-space:pre;
 }
 .overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
 .useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
@@ -394,98 +381,89 @@
 .overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
 .useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
     white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    padding-bottom:7px;
+    padding-top:8px;
+    padding-left:8px;
     display:inline-block;
     float:left;
-    background-color:#F8981D;
-    border: none;
-    height:16px;
+    background-image:url(resources/titlebar.gif);
 }
 .memberSummary caption span.activeTableTab span {
     white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
+    padding-top:8px;
+    padding-left:8px;
     display:inline-block;
     float:left;
-    background-color:#F8981D;
-    height:16px;
+    background-image:url(resources/activetitlebar.gif);
 }
 .memberSummary caption span.tableTab span {
     white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
+    padding-top:8px;
+    padding-left:8px;
     display:inline-block;
     float:left;
-    background-color:#4D7A97;
-    height:16px;
+    background-image:url(resources/titlebar.gif);
 }
 .memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
     padding-top:0px;
     padding-left:0px;
-    padding-right:0px;
     background-image:none;
     float:none;
-    display:inline;
+    display:inline-block;
 }
 .overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
 .useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
-    display:none;
-    width:5px;
+    width:10px;
+    background-image:url(resources/titlebar_end.gif);
+    background-repeat:no-repeat;
+    background-position:top right;
     position:relative;
     float:left;
-    background-color:#F8981D;
 }
 .memberSummary .activeTableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
-    position:relative; 
+    width:10px;
+    margin-right:5px;
+    background-image:url(resources/activetitlebar_end.gif);
+    background-repeat:no-repeat;
+    background-position:top right;
+    position:relative;
     float:left;
-    background-color:#F8981D;
 }
 .memberSummary .tableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
+    width:10px;
+    margin-right:5px;
+    background-image:url(resources/titlebar_end.gif);
+    background-repeat:no-repeat;
+    background-position:top right;
     position:relative;
-    background-color:#4D7A97;
     float:left;
-
 }
 .overviewSummary td, .memberSummary td, .typeSummary td,
 .useSummary td, .constantsSummary td, .deprecatedSummary td {
     text-align:left;
-    padding:0px 0px 12px 10px;
-    width:100%;
+    padding:3px 3px 3px 7px;
 }
 th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
 td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
     vertical-align:top;
-    padding-right:0px;
-    padding-top:8px;
-    padding-bottom:3px;
+    padding-right:3px;
 }
 th.colFirst, th.colLast, th.colOne, .constantsSummary th {
     background:#dee3e9;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
     text-align:left;
-    padding:8px 3px 3px 7px;
+    padding:3px 3px 3px 7px;
 }
 td.colFirst, th.colFirst {
+    border-left:1px solid #9eadc0;
     white-space:nowrap;
-    font-size:13px;
 }
 td.colLast, th.colLast {
-    font-size:13px;
+    border-right:1px solid #9eadc0;
 }
 td.colOne, th.colOne {
-    font-size:13px;
+    border-right:1px solid #9eadc0;
+    border-left:1px solid #9eadc0;
 }
 .overviewSummary td.colFirst, .overviewSummary th.colFirst,
 .overviewSummary td.colOne, .overviewSummary th.colOne,
@@ -493,19 +471,19 @@
 .memberSummary td.colOne, .memberSummary th.colOne,
 .typeSummary td.colFirst{
     width:25%;
-    vertical-align:top;
+    vertical-align:middle;
 }
 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 {
     font-weight:bold;
 }
 .tableSubHeadingColor {
-    background-color:#EEEEFF;
+    background-color: #EEEEFF;
 }
 .altColor {
-    background-color:#FFFFFF;
+    background-color:#eeeeef;
 }
 .rowColor {
-    background-color:#EEEEEF;
+    background-color:#ffffff;
 }
 /*
 Content styles
@@ -520,24 +498,6 @@
 .docSummary {
     padding:0;
 }
-
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
-    font-style:normal;
-}
-
-div.block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-
-td.colLast div {
-    padding-top:0px;
-}
-
-
-td.colLast a {
-    padding-bottom:3px;
-}
 /*
 Formatting effect styles
 */
@@ -548,12 +508,11 @@
 h1.hidden {
     visibility:hidden;
     overflow:hidden;
-    font-size:10px;
+    font-size:.9em;
 }
 .block {
     display:block;
-    margin:3px 10px 2px 0px;
-    color:#474747;
+    margin:3px 0 0 0;
 }
 .deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
 .overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
@@ -563,12 +522,3 @@
 .deprecationComment, .emphasizedPhrase, .interfaceName {
     font-style:italic;
 }
-
-div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
-div.block div.block span.interfaceName {
-    font-style:normal;
-}
-
-div.contentContainer ul.blockList li.blockList h2{
-    padding-bottom:0px;
-}
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java	Wed Jan 15 13:33:53 2014 -0500
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java	Wed Jan 15 13:36:51 2014 -0500
@@ -122,7 +122,9 @@
     /** The name of the file for the overview frame. */
     public static final DocPath PROFILE_OVERVIEW_FRAME = DocPath.create("profile-overview-frame.html");
 
-    /** The name of the sub-package from which resources are read. */
+    /** The name of the directory in which resources are generated.
+     *  Also the name of the sub-package from which resources are read.
+     */
     public static final DocPath RESOURCES = DocPath.create("resources");
 
     /** The name of the file for the serialized form info. */