# HG changeset patch
# User schien
# Date 1308616794 25200
# Node ID 06b6bbbe2787f8b0970ccd357f3d993ab265cb66
# Parent  f27b6f45a44956494d89c5efa1f6f488d56c1fdc# Parent  436fb6aeda5a190121039680998b3cb81191fdc3
Merge

diff -r f27b6f45a449 -r 06b6bbbe2787 .hgtags
--- a/.hgtags	Wed Jun 08 10:25:17 2011 -0700
+++ b/.hgtags	Mon Jun 20 17:39:54 2011 -0700
@@ -120,3 +120,4 @@
 5faa9eedc44e201f2b13ad837e9077668b823d28 jdk7-b143
 8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144
 c455e2ae5c93014ae3fc475aba4509b5f70465f7 jdk7-b145
+9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
diff -r f27b6f45a449 -r 06b6bbbe2787 src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Wed Jun 08 10:25:17 2011 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Mon Jun 20 17:39:54 2011 -0700
@@ -110,7 +110,10 @@
         String configstylefile = configuration.stylesheetfile;
         performCopy(configdestdir, confighelpfile);
         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
         if (configuration.classuse) {
             ClassUseWriter.generate(configuration, classtree);
diff -r f27b6f45a449 -r 06b6bbbe2787 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/background.gif
Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/background.gif has changed
diff -r f27b6f45a449 -r 06b6bbbe2787 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/inherit.gif
Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/inherit.gif has changed
diff -r f27b6f45a449 -r 06b6bbbe2787 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Jun 08 10:25:17 2011 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Mon Jun 20 17:39:54 2011 -0700
@@ -3,187 +3,290 @@
 Overall document style
 */
 body {
-    font-family:Helvetica, Arial, sans-serif;
-    color:#000000;
+    background-color:#ffffff;
+    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 {
-    font-size:1.0em;
+    font-size:1.3em;
 }
 h1 {
+    font-size:1.8em;
+}
+h2 {
+    font-size:1.5em;
+}
+h3 {
     font-size:1.4em;
 }
-h2 {
-    font-size:1.35em;
-}
-h3 {
+h4 {
     font-size:1.3em;
 }
-h4 {
-    font-size:1.25em;
+h5 {
+    font-size:1.2em;
+}
+h6 {
+    font-size:1.1em;
 }
 ul {
-    margin:10px 0 10px 20px;
     list-style-type:disc;
 }
-caption {
-    background: #CCCCFF;
-    color:#000000;
-    text-align:left;
-    font-size:150%;
-    font-weight:bold;
-    border-left:2px ridge;
-    border-right:2px ridge;
-    border-top:2px ridge;
-    padding-left:5px;
-    width:auto;
+code, tt {
+    font-size:1.2em;
+}
+dt code {
+    font-size:1.2em;
+}
+table tr td dt code {
+    font-size:1.2em;
+    vertical-align:top;
+}
+sup {
+    font-size:.6em;
 }
 /*
 Document title and Copyright styles
 */
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
 .aboutLanguage {
     float:right;
-    font-size:0.9em;
-    color:#000000;
+    padding:0px 21px;
+    font-size:.8em;
+    z-index:200;
+    margin-top:-7px;
 }
 .legalCopy {
-    margin:7px 0;
+    margin-left:.5em;
 }
-.bar {
-    font-size:1em;
-    margin:10px 0 0 2px;
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
 }
-.bar a {
-    font-weight:normal;
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    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
 */
+.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 {
-    border-top:2px solid #C0C0C0;
-    padding:7px 0;
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
     height:2.8em;
-    width:100%;
-    min-width:600px;
+    padding-top:10px;
+    overflow:hidden;
 }
 .bottomNav {
-    border-top:2px solid #C0C0C0;
-    padding:7px 0;
+    margin-top:10px;
+    background-image:url(resources/background.gif);
+    background-repeat:repeat-x;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
     height:2.8em;
-    width:100%;
+    padding-top:10px;
+    overflow:hidden;
 }
 .subNav {
-    border-bottom:2px solid #C0C0C0;
+    background-color:#dee3e9;
+    border-bottom:1px solid #9eadc0;
     float:left;
     width:100%;
-    min-width:600px;
+    overflow:hidden;
 }
 .subNav div {
     clear:left;
     float:left;
-    padding:0 0 5px 2px;
-    width:100%;
+    padding:0 0 5px 6px;
 }
-.topNav a:link,.topNav a:active, .topNav a:visited, .topNav a:hover,
-.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;
+ul.navList, ul.subNavList {
     float:left;
-    width:80%;
+    margin:0 25px 0 0;
+    padding:0;
 }
 ul.navList li{
     list-style:none;
     float:left;
-    padding:0 4px;
-    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;
+    padding:3px 6px;
 }
 ul.subNavList li{
     list-style:none;
     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
 */
 .header, .footer {
     clear:both;
-    padding:10px 0;
+    margin:0 20px;
+    padding:5px 0 0 0;
 }
 .indexHeader {
-    font-size:0.9em;
-    margin:10px 0 0 2px;
+    margin:10px;
+    position:relative;
+}
+.indexHeader h1 {
+    font-size:1.3em;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
 }
 .header ul {
-    padding-left:20px;
+    margin:0 0 25px 0;
+    padding:0;
 }
-/* Header and footer title styles */
-.header h1.title {
-    font-size:1.4em;
-    text-align:center;
-    margin:0;
+.footer ul {
+    margin:20px 0 5px 0;
 }
-.header h2.title {
-    font-size:1.35em;
-    margin:0;
-}
-.subTitle {
-    padding-top:10px;
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:1.2em;
 }
 /*
-Content styles
+Heading styles
 */
-.deprecatedContent {
-    margin:0;
-    padding:10px 0;
+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-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
+    margin:0 0 6px -8px;
+    padding:2px 5px;
 }
-.docSummary {
-    padding-top:10px;
+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;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
 }
 /*
 Page layout container styles
 */
-.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer,
-.constantValuesContainer {
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
     clear:both;
+    padding:10px 20px;
     position:relative;
-    padding-bottom:20px;
 }
 .indexContainer {
-    padding:0 0 0 2px;
+    margin:10px;
+    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;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
     font-size:0.9em;
 }
-/*
-Class inheritance information styles
-*/
 ul.inheritance {
     margin:0;
     padding:0;
@@ -194,236 +297,178 @@
 }
 ul.inheritance li ul.inheritance {
     margin-left:15px;
-    background-image:url(resources/inherit.gif);
-    background-repeat:no-repeat;
     padding-left:15px;
     padding-top:1px;
 }
-/*
-Heading styles
-*/
-.indexContainer h2 {
-    font-weight:normal;
-    font-size:1.0em;
-    padding:5px 0 0 0;
-    margin:10px 0 0 0;
-}
-.contentContainer h2 {
-    margin:10px 0;
-}
-.constantValuesContainer h2 {
-    background:#CCCCFF;
-    border:2px ridge;
-    padding:3px;
-    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 {
-    background:#EEEEFF;
-    border:0;
-    border-bottom:2px ridge;
-}
-div.details ul.blockList ul.blockList ul.blockList li.blockList h4,
-div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
-    font-size:1.15em;
-    font-weight:bold;
-    padding:0 0 5px 0;
-    margin:0;
-}
-/*
-Table styles
-*/
-.contentContainer table {
-    border-collapse:collapse ;
-    width:100%;
-}
-.contentContainer table td, .contentContainer table th {
-    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%;
-    margin:0 0 10px 0;
-}
-.classUseContainer ul li ul li table caption{
-    font-size:0.95em;
-    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{
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
     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{
-    padding-left:40px;
-}
-.classUseContainer ul li ul li table .colLast div.block,
-.classUseContainer ul li ul li table .colOne div.block{
-    padding-left:40px;
-}
-/*
-List styles
-*/
-ul.horizontal li {
-    display:inline;
-    font-size:0.9em;   
-}
-/* Container specific list styles */
-.indexContainer ul {
-    margin:0;
-    padding:0;
-}
-.indexContainer ul li {
-    list-style:none;
-}
-.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList {
-    border:0;
-}
-.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList {
-    list-style:none;
-    border:0;
-    border-bottom:2px ridge;
-    height:1%;
-}
-.serializedFormContainer ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockListLast {
-    list-style:none;
-}
-/* General list styles */
-ul.blockList, ul.blockListLast {
-    margin-left:0;
-    padding-left:0;
 }
 ul.blockList li.blockList, ul.blockListLast li.blockList {
     list-style:none;
     margin-bottom:25px;
 }
-ul.blockList ul.blockList ul.blockList li.blockList {
-    border:2px ridge;
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #9eadc0;
+    background-color:#f9f9f9;
 }
-div.details ul.blockList ul.blockList ul.blockList li.blockList {
-    border:0;
-    border-bottom:2px ridge;
-    height:1%;
+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:1px solid #9eadc0;
+    border-top:none;
 }
-/* Definition list styles */
-ul.blockList li.blockList dl{
-    margin-bottom:15px;
+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 li.blockList dl dd{
-    margin:0 0 0 30px;
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
 }
-ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList dl,
-ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList dl{
-    padding:0 0 10px 35px;
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
 }
-dl.nameValue dt, dl.nameValue dd{
-    display:inline;
+/*
+Table styles
+*/
+.contentContainer table, .classUseContainer table, .constantValuesContainer table {
+    border-bottom:1px solid #9eadc0;
+    width:100%;
 }
-ul.blockList li.blockList pre{
-    margin:0 0 15px 0;
+.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table {
+    width:100%;
 }
-.description dl dt {
-    font-size:0.95em;
+.contentContainer .description table, .contentContainer .details table {
+    border-bottom:none;
+}
+.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{
+    vertical-align:top;
+    padding-right:20px;
+}
+.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast,
+.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast,
+.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 {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#FFFFFF;
     font-weight:bold;
-    margin:5px 0 0 0;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    margin:0px;
 }
-.description dl dd {
-    margin:10px 0 10px 20px;
+caption a:link, caption a:hover, caption a:active, caption a:visited {
+    color:#FFFFFF;
 }
-/* List content styles */
-ul.blockList li.blockList ul.blockList li.blockList pre{
-    margin:10px 0 10px 0;
+.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span {
+    white-space:nowrap;
+    padding-top:8px;
+    padding-left:8px;
+    display:block;
+    float:left;
+    background-image:url(resources/titlebar.gif);
+    height:18px;
 }
-ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList pre,
-ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList pre{
-    padding:0 0 10px 0;
+.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd {
+    width:10px;
+    background-image:url(resources/titlebar_end.gif);
+    background-repeat:no-repeat;
+    background-position:top right;
+    position:relative;
+    float:left;
 }
-ul.blockList li.blockList ul.blockList li.blockList ul.blockList li.blockList div.block,
-ul.blockList li.blockList ul.blockList li.blockList ul.blockListLast li.blockList div.block{
-    padding:0 0 10px 35px;
+ul.blockList ul.blockList li.blockList table {
+    margin:0 0 12px 0px;
+    width:100%;
+}
+.tableSubHeadingColor {
+    background-color: #EEEEFF;
+}
+.altColor {
+    background-color:#eeeeef;
+}
+.rowColor {
+    background-color:#ffffff;
+}
+.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td {
+    text-align:left;
+    padding:3px 3px 3px 7px;
+}
+th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
+    background:#dee3e9;
+    border-top:1px solid #9eadc0;
+    border-bottom:1px solid #9eadc0;
+    text-align:left;
+    padding:3px 3px 3px 7px;
+}
+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;
+}
+td.colFirst, th.colFirst {
+    border-left:1px solid #9eadc0;
+    white-space:nowrap;
+}
+td.colLast, th.colLast {
+    border-right:1px solid #9eadc0;
+}
+td.colOne, th.colOne {
+    border-right:1px solid #9eadc0;
+    border-left:1px solid #9eadc0;
+}
+table.overviewSummary  {
+    padding:0px;
+    margin-left:0px;
+}
+table.overviewSummary td.colFirst, table.overviewSummary th.colFirst,
+table.overviewSummary td.colOne, table.overviewSummary th.colOne {
+    width:25%;
+    vertical-align:middle;
+}
+table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
+    width:25%;
+    vertical-align:middle;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
 }
 /*
 Formatting effect styles
 */
-.strong {
-    font-weight:bold;
-}
 .sourceLineNo {
     color:green;
     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;
+}
diff -r f27b6f45a449 -r 06b6bbbe2787 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/tab.gif
Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/tab.gif has changed
diff -r f27b6f45a449 -r 06b6bbbe2787 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar.gif
Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar.gif has changed
diff -r f27b6f45a449 -r 06b6bbbe2787 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar_end.gif
Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar_end.gif has changed
diff -r f27b6f45a449 -r 06b6bbbe2787 test/com/sun/javadoc/AccessH1/AccessH1.java
--- a/test/com/sun/javadoc/AccessH1/AccessH1.java	Wed Jun 08 10:25:17 2011 -0700
+++ b/test/com/sun/javadoc/AccessH1/AccessH1.java	Mon Jun 20 17:39:54 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * 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.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4636667
+ * @bug 4636667 7052425
  * @summary  Use <H1, <H2>, and <H3> in proper sequence for accessibility
  * @author dkramer
  * @run main AccessH1
@@ -42,7 +42,7 @@
  */
 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 FS = System.getProperty("file.separator");
     private static final String PS = System.getProperty("path.separator");
@@ -85,8 +85,7 @@
     private static final String[][] testArray = {
         // Test the style sheet
         {
-            ".header h1.title {" + LS + "    font-size:1.4em;" + LS +
-            "    text-align:center;" + LS + "    margin:0;" + LS +
+            "h1 {" + LS + "    font-size:1.8em;" + LS +
             "}",
             TMPDEST_DIR1 + "stylesheet.css"
         },
diff -r f27b6f45a449 -r 06b6bbbe2787 test/com/sun/javadoc/testStylesheet/TestStylesheet.java
--- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Wed Jun 08 10:25:17 2011 -0700
+++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Mon Jun 20 17:39:54 2011 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4494033 7028815
+ * @bug      4494033 7028815 7052425
  * @summary  Run tests on doclet stylesheet.
  * @author   jamieh
  * @library  ../lib/
@@ -34,7 +34,7 @@
 public class TestStylesheet extends JavadocTester {
 
     //Test information.
-    private static final String BUG_ID = "4494033-7028815";
+    private static final String BUG_ID = "4494033-7028815-7052425";
 
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
@@ -52,11 +52,12 @@
         {BUG_ID + FS + "stylesheet.css",
                 "/*" + NL + "Navigation bar styles" + NL + "*/"},
         {BUG_ID + FS + "stylesheet.css",
-                "body {" + NL + "    font-family:Helvetica, Arial, sans-serif;" + NL +
-                "    color:#000000;" + NL + "}"},
+                "body {" + NL + "    background-color:#ffffff;" + NL +
+                "    color:#353833;" + NL +
+                "    font-family:Arial, Helvetica, sans-serif;" + NL +
+                "    font-size:76%;" + NL + "    margin:0;" + NL + "}"},
         {BUG_ID + FS + "stylesheet.css",
-                "ul {" + NL + "    margin:10px 0 10px 20px;" + NL +
-                "    list-style-type:disc;" + NL + "}"},
+                "ul {" + NL + "    list-style-type:disc;" + NL + "}"},
         // Test whether a link to the stylesheet file is inserted properly
         // in the class documentation.
         {BUG_ID + FS + "pkg" + FS + "A.html",
diff -r f27b6f45a449 -r 06b6bbbe2787 test/tools/javac/meth/InvokeMH.java
--- a/test/tools/javac/meth/InvokeMH.java	Wed Jun 08 10:25:17 2011 -0700
+++ b/test/tools/javac/meth/InvokeMH.java	Mon Jun 20 17:39:54 2011 -0700
@@ -77,23 +77,23 @@
         Object o; String s; int i;  // for return type testing
 
         // next five must have sig = (*,*)*
-        o = mh_SiO.invokeGeneric((Object)"world", (Object)123);
-        mh_SiO.invokeGeneric((Object)"mundus", (Object)456);
+        o = mh_SiO.invoke((Object)"world", (Object)123);
+        mh_SiO.invoke((Object)"mundus", (Object)456);
         Object k = "kosmos";
-        o = mh_SiO.invokeGeneric(k, 789);
-        o = mh_SiO.invokeGeneric(null, 000);
-        o = mh_SiO.invokeGeneric("arda", -123);
+        o = mh_SiO.invoke(k, 789);
+        o = mh_SiO.invoke(null, 000);
+        o = mh_SiO.invoke("arda", -123);
 
         // sig = ()String
-        o = mh_vS.invokeGeneric();
+        o = mh_vS.invoke();
 
         // sig = ()int
-        i = (int) mh_vi.invokeGeneric();
-        o = (int) mh_vi.invokeGeneric();
-        mh_vi.invokeGeneric();
+        i = (int) mh_vi.invoke();
+        o = (int) mh_vi.invoke();
+        mh_vi.invoke();
 
         // sig = ()void
-        mh_vv.invokeGeneric();
-        o = mh_vv.invokeGeneric();
+        mh_vv.invoke();
+        o = mh_vv.invoke();
     }
 }
diff -r f27b6f45a449 -r 06b6bbbe2787 test/tools/javac/meth/XlintWarn.java
--- a/test/tools/javac/meth/XlintWarn.java	Wed Jun 08 10:25:17 2011 -0700
+++ b/test/tools/javac/meth/XlintWarn.java	Mon Jun 20 17:39:54 2011 -0700
@@ -35,19 +35,19 @@
 class XlintWarn {
     void test(MethodHandle mh) throws Throwable {
         int i1 = (int)mh.invokeExact();
-        int i2 = (int)mh.invokeGeneric();
+        int i2 = (int)mh.invoke();
         int i3 = (int)mh.invokeWithArguments();
     }
 
     void test2(MethodHandle mh) throws Throwable {
         int i1 = (int)(mh.invokeExact());
-        int i2 = (int)(mh.invokeGeneric());
+        int i2 = (int)(mh.invoke());
         int i3 = (int)(mh.invokeWithArguments());
     }
 
     void test3(MethodHandle mh) throws Throwable {
         int i1 = (int)((mh.invokeExact()));
-        int i2 = (int)((mh.invokeGeneric()));
+        int i2 = (int)((mh.invoke()));
         int i3 = (int)((mh.invokeWithArguments()));
     }
 }