# HG changeset patch # User bpatel # Date 1387424927 28800 # Node ID b8ebde062692f0942de757fd48402bf0b4af4e5e # Parent f1be939b49f6fbf038ceda280a15d6561f9491c7 8016549: jdk7 javadocs are hard to read Reviewed-by: jjg diff -r f1be939b49f6 -r b8ebde062692 src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Tue Dec 17 23:32:58 2013 -0800 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Wed Dec 18 19:48:47 2013 -0800 @@ -115,12 +115,6 @@ boolean nodeprecated = configuration.nodeprecated; performCopy(configuration.helpfile); performCopy(configuration.stylesheetfile); - copyResourceFile("background.gif"); - copyResourceFile("tab.gif"); - copyResourceFile("titlebar.gif"); - copyResourceFile("titlebar_end.gif"); - copyResourceFile("activetitlebar.gif"); - copyResourceFile("activetitlebar_end.gif"); // do early to reduce memory footprint if (configuration.classuse) { ClassUseWriter.generate(configuration, classtree); @@ -314,16 +308,6 @@ return docletToStart.configuration.validOptions(options, reporter); } - /** - * Copy a file in the resources directory to the destination directory. - * @param resource The name of the resource file to copy - */ - private void copyResourceFile(String resource) { - DocPath p = DocPaths.RESOURCES.resolve(resource); - DocFile f = DocFile.createFileForOutput(configuration, p); - f.copyResource(p, false, false); - } - private void performCopy(String filename) { if (filename.isEmpty()) return; diff -r f1be939b49f6 -r b8ebde062692 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/activetitlebar.gif Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/activetitlebar.gif has changed diff -r f1be939b49f6 -r b8ebde062692 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/activetitlebar_end.gif Binary file src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/activetitlebar_end.gif has changed diff -r f1be939b49f6 -r b8ebde062692 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 f1be939b49f6 -r b8ebde062692 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 Tue Dec 17 23:32:58 2013 -0800 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Dec 18 19:48:47 2013 -0800 @@ -2,16 +2,19 @@ /* Overall document style */ + +@import url('resources/fonts/dejavu.css'); + body { background-color:#ffffff; color:#353833; - font-family:Arial, Helvetica, sans-serif; - font-size:76%; + font-family:'DejaVu Sans', Arial, Helvetica, sans-serif; + font-size:14px; margin:0; } a:link, a:visited { text-decoration:none; - color:#4c6b87; + color:#4A6782; } a:hover, a:focus { text-decoration:none; @@ -19,7 +22,7 @@ } a:active { text-decoration:none; - color:#4c6b87; + color:#4A6782; } a[name] { color:#353833; @@ -29,41 +32,51 @@ color:#353833; } pre { - font-size:1.3em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; } h1 { - font-size:1.8em; + font-size:20px; } h2 { - font-size:1.5em; + font-size:18px; } h3 { - font-size:1.4em; + font-size:16px; + font-style:italic; } h4 { - font-size:1.3em; + font-size:13px; } h5 { - font-size:1.2em; + font-size:12px; } h6 { - font-size:1.1em; + font-size:11px; } ul { list-style-type:disc; } code, tt { - font-size:1.2em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + padding-top:4px; + margin-top:8px; + line-height:1.4em; } dt code { - font-size:1.2em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + padding-top:4px; } table tr td dt code { - font-size:1.2em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; vertical-align:top; + padding-top:4px; } sup { - font-size:.6em; + font-size:8px; } /* Document title and Copyright styles @@ -76,10 +89,9 @@ .aboutLanguage { float:right; padding:0px 21px; - font-size:.8em; - font-style:italic; + font-size:11px; z-index:200; - margin-top:-7px; + margin-top:-9px; } .legalCopy { margin-left:.5em; @@ -93,9 +105,6 @@ } .tab { background-color:#0066FF; - background-image:url(resources/titlebar.gif); - background-position:left top; - background-repeat:no-repeat; color:#ffffff; padding:8px; width:5em; @@ -105,17 +114,15 @@ Navigation bar styles */ .bar { - background-image:url(resources/background.gif); - background-repeat:repeat-x; + background-color:#4D7A97; color:#FFFFFF; padding:.8em .5em .4em .8em; height:auto;/*height:1.8em;*/ - font-size:1em; + font-size:11px; margin:0; } .topNav { - background-image:url(resources/background.gif); - background-repeat:repeat-x; + background-color:#4D7A97; color:#FFFFFF; float:left; padding:0; @@ -124,11 +131,11 @@ height:2.8em; padding-top:10px; overflow:hidden; + font-size:12px; } .bottomNav { margin-top:10px; - background-image:url(resources/background.gif); - background-repeat:repeat-x; + background-color:#4D7A97; color:#FFFFFF; float:left; padding:0; @@ -137,18 +144,20 @@ 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; @@ -158,34 +167,34 @@ ul.navList li{ list-style:none; float:left; - padding:3px 6px; + padding: 5px 6px; + text-transform:uppercase; } 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-image:url(resources/tab.gif); - background-color:#a88834; - color:#FFFFFF; + background-color:#F8981D; + color:#253441; margin: auto 5px; - border:1px solid #c9aa44; } .skipNav { position:absolute; top:auto; left:-9999px; overflow:hidden; - } +} /* Page header and footer styles */ @@ -202,7 +211,7 @@ margin-right:15px; } .indexHeader h1 { - font-size:1.3em; + font-size:13px; } .title { color:#2c4557; @@ -212,7 +221,7 @@ margin:5px 0 0 0; } .header ul { - margin:0 0 25px 0; + margin:0 0 15px 0; padding:0; } .footer ul { @@ -220,24 +229,22 @@ } .header ul li, .footer ul li { list-style:none; - font-size:1.2em; + font-size:13px; } /* 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-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; + border:1px solid #d0d9e0; margin:0 0 6px -8px; - padding:2px 5px; + padding:7px 5px; } ul.blockList ul.blockList ul.blockList li.blockList h3 { background-color:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; + border:1px solid #d0d9e0; margin:0 0 6px -8px; - padding:2px 5px; + padding:7px 5px; } ul.blockList ul.blockList li.blockList h3 { padding:0; @@ -257,10 +264,10 @@ .indexContainer { margin:10px; position:relative; - font-size:1.0em; + font-size:12px; } .indexContainer h2 { - font-size:1.1em; + font-size:13px; padding:0 0 3px 0; } .indexContainer ul { @@ -269,15 +276,18 @@ } .indexContainer ul li { list-style:none; + padding-top:2px; } .contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { - font-size:1.1em; + font-size:12px; 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; + margin:5px 0 10px 0px; + font-size:14px; + font-family:'DejaVu Sans Mono',monospace; } .serializedFormContainer dl.nameValue dt { margin-left:1px; @@ -316,25 +326,24 @@ } ul.blockList li.blockList, ul.blockListLast li.blockList { list-style:none; - margin-bottom:25px; + margin-bottom:15px; + line-height:1.4; } ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { padding:0px 20px 5px 10px; - border:1px solid #9eadc0; - background-color:#f9f9f9; + border:1px solid #ededed; + background-color:#f8f8f8; } 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; + border: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; @@ -349,9 +358,10 @@ 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; @@ -361,12 +371,15 @@ position:relative; text-align:left; background-repeat:no-repeat; - color:#FFFFFF; + color:#253441; 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, @@ -381,89 +394,98 @@ .overviewSummary caption span, .memberSummary caption span, .typeSummary caption span, .useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span { white-space:nowrap; - padding-top:8px; - padding-left:8px; + padding-top:5px; + padding-left:12px; + padding-right:12px; + padding-bottom:7px; display:inline-block; float:left; - background-image:url(resources/titlebar.gif); + background-color:#F8981D; + border: none; + height:16px; } .memberSummary caption span.activeTableTab span { white-space:nowrap; - padding-top:8px; - padding-left:8px; + padding-top:5px; + padding-left:12px; + padding-right:12px; + margin-right:3px; display:inline-block; float:left; - background-image:url(resources/activetitlebar.gif); + background-color:#F8981D; + height:16px; } .memberSummary caption span.tableTab span { white-space:nowrap; - padding-top:8px; - padding-left:8px; + padding-top:5px; + padding-left:12px; + padding-right:12px; + margin-right:3px; display:inline-block; float:left; - background-image:url(resources/titlebar.gif); + background-color:#4D7A97; + height:16px; } .memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab { padding-top:0px; padding-left:0px; + padding-right:0px; background-image:none; float:none; - display:inline-block; + display:inline; } .overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd, .useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd { - width:10px; - background-image:url(resources/titlebar_end.gif); - background-repeat:no-repeat; - background-position:top right; + display:none; + width:5px; position:relative; float:left; + background-color:#F8981D; } .memberSummary .activeTableTab .tabEnd { - width:10px; - margin-right:5px; - background-image:url(resources/activetitlebar_end.gif); - background-repeat:no-repeat; - background-position:top right; - position:relative; + display:none; + width:5px; + margin-right:3px; + position:relative; float:left; + background-color:#F8981D; } .memberSummary .tableTab .tabEnd { - width:10px; - margin-right:5px; - background-image:url(resources/titlebar_end.gif); - background-repeat:no-repeat; - background-position:top right; + display:none; + width:5px; + margin-right:3px; position:relative; + background-color:#4D7A97; float:left; + } .overviewSummary td, .memberSummary td, .typeSummary td, .useSummary td, .constantsSummary td, .deprecatedSummary td { text-align:left; - padding:3px 3px 3px 7px; + padding:0px 0px 12px 10px; + width:100%; } 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:3px; + padding-right:0px; + padding-top:8px; + padding-bottom: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:3px 3px 3px 7px; + padding:8px 3px 3px 7px; } td.colFirst, th.colFirst { - border-left:1px solid #9eadc0; white-space:nowrap; + font-size:13px; } td.colLast, th.colLast { - border-right:1px solid #9eadc0; + font-size:13px; } td.colOne, th.colOne { - border-right:1px solid #9eadc0; - border-left:1px solid #9eadc0; + font-size:13px; } .overviewSummary td.colFirst, .overviewSummary th.colFirst, .overviewSummary td.colOne, .overviewSummary th.colOne, @@ -471,19 +493,19 @@ .memberSummary td.colOne, .memberSummary th.colOne, .typeSummary td.colFirst{ width:25%; - vertical-align:middle; + vertical-align:top; } 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:#eeeeef; + background-color:#FFFFFF; } .rowColor { - background-color:#ffffff; + background-color:#EEEEEF; } /* Content styles @@ -498,6 +520,24 @@ .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 */ @@ -508,11 +548,12 @@ h1.hidden { visibility:hidden; overflow:hidden; - font-size:.9em; + font-size:10px; } .block { display:block; - margin:3px 0 0 0; + margin:3px 10px 2px 0px; + color:#474747; } .deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink, .overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel, @@ -522,3 +563,12 @@ .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; +} diff -r f1be939b49f6 -r b8ebde062692 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 f1be939b49f6 -r b8ebde062692 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 f1be939b49f6 -r b8ebde062692 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 f1be939b49f6 -r b8ebde062692 src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java Tue Dec 17 23:32:58 2013 -0800 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java Wed Dec 18 19:48:47 2013 -0800 @@ -122,9 +122,7 @@ /** 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 directory in which resources are generated. - * Also the name of the sub-package from which resources are read. - */ + /** 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. */ diff -r f1be939b49f6 -r b8ebde062692 test/com/sun/javadoc/AccessH1/AccessH1.java --- a/test/com/sun/javadoc/AccessH1/AccessH1.java Tue Dec 17 23:32:58 2013 -0800 +++ b/test/com/sun/javadoc/AccessH1/AccessH1.java Wed Dec 18 19:48:47 2013 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 4636667 7052425 + * @bug 4636667 7052425 8016549 * @summary Use , and

in proper sequence for accessibility * @author dkramer * @run main AccessH1 @@ -85,7 +85,7 @@ private static final String[][] testArray = { // Test the style sheet { - "h1 {" + LS + " font-size:1.8em;" + LS + + "h1 {" + LS + " font-size:20px;" + LS + "}", TMPDEST_DIR1 + "stylesheet.css" }, diff -r f1be939b49f6 -r b8ebde062692 test/com/sun/javadoc/testStylesheet/TestStylesheet.java --- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Tue Dec 17 23:32:58 2013 -0800 +++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Wed Dec 18 19:48:47 2013 -0800 @@ -23,7 +23,7 @@ /* * @test - * @bug 4494033 7028815 7052425 8007338 8023608 8008164 + * @bug 4494033 7028815 7052425 8007338 8023608 8008164 8016549 * @summary Run tests on doclet stylesheet. * @author jamieh * @library ../lib/ @@ -54,8 +54,8 @@ {BUG_ID + FS + "stylesheet.css", "body {" + NL + " background-color:#ffffff;" + NL + " color:#353833;" + NL + - " font-family:Arial, Helvetica, sans-serif;" + NL + - " font-size:76%;" + NL + " margin:0;" + NL + "}"}, + " font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;" + NL + + " font-size:14px;" + NL + " margin:0;" + NL + "}"}, {BUG_ID + FS + "stylesheet.css", "ul {" + NL + " list-style-type:disc;" + NL + "}"}, {BUG_ID + FS + "stylesheet.css", @@ -64,49 +64,65 @@ " position:relative;" + NL + " text-align:left;" + NL + " background-repeat:no-repeat;" + NL + - " color:#FFFFFF;" + NL + + " color:#253441;" + NL + " font-weight:bold;" + NL + " clear:none;" + NL + " overflow:hidden;" + NL + " padding:0px;" + NL + + " padding-top:10px;" + NL + + " padding-left:1px;" + NL + " margin:0px;" + NL + + " white-space:pre;" + NL + "}"}, {BUG_ID + FS + "stylesheet.css", ".overviewSummary caption span, .memberSummary caption span, .typeSummary caption span," + NL + ".useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {" + NL + " white-space:nowrap;" + NL + - " padding-top:8px;" + NL + - " padding-left:8px;" + NL + + " padding-top:5px;" + NL + + " padding-left:12px;" + NL + + " padding-right:12px;" + NL + + " padding-bottom:7px;" + NL + " display:inline-block;" + NL + " float:left;" + NL + - " background-image:url(resources/titlebar.gif);" + NL + + " background-color:#F8981D;" + NL + + " border: none;" + NL + + " height:16px;" + NL + "}"}, {BUG_ID + FS + "stylesheet.css", ".memberSummary caption span.activeTableTab span {" + NL + " white-space:nowrap;" + NL + - " padding-top:8px;" + NL + - " padding-left:8px;" + NL + + " padding-top:5px;" + NL + + " padding-left:12px;" + NL + + " padding-right:12px;" + NL + + " margin-right:3px;" + NL + " display:inline-block;" + NL + " float:left;" + NL + - " background-image:url(resources/activetitlebar.gif);" + NL + + " background-color:#F8981D;" + NL + + " height:16px;" + NL + "}"}, {BUG_ID + FS + "stylesheet.css", ".memberSummary caption span.tableTab span {" + NL + " white-space:nowrap;" + NL + - " padding-top:8px;" + NL + - " padding-left:8px;" + NL + + " padding-top:5px;" + NL + + " padding-left:12px;" + NL + + " padding-right:12px;" + NL + + " margin-right:3px;" + NL + " display:inline-block;" + NL + " float:left;" + NL + - " background-image:url(resources/titlebar.gif);" + NL + + " background-color:#4D7A97;" + NL + + " height:16px;" + NL + "}"}, {BUG_ID + FS + "stylesheet.css", ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {" + NL + " padding-top:0px;" + NL + " padding-left:0px;" + NL + + " padding-right:0px;" + NL + " background-image:none;" + NL + " float:none;" + NL + - " display:inline-block;" + NL + + " display:inline;" + NL + "}"}, + {BUG_ID + FS + "stylesheet.css", + "@import url('resources/fonts/dejavu.css');"}, // Test whether a link to the stylesheet file is inserted properly // in the class documentation. {BUG_ID + FS + "pkg" + FS + "A.html", diff -r f1be939b49f6 -r b8ebde062692 test/tools/javadoc/api/basic/APITest.java --- a/test/tools/javadoc/api/basic/APITest.java Tue Dec 17 23:32:58 2013 -0800 +++ b/test/tools/javadoc/api/basic/APITest.java Wed Dec 18 19:48:47 2013 -0800 @@ -202,12 +202,6 @@ "pkg/package-frame.html", "pkg/package-summary.html", "pkg/package-tree.html", - "resources/background.gif", - "resources/tab.gif", - "resources/activetitlebar_end.gif", - "resources/activetitlebar.gif", - "resources/titlebar_end.gif", - "resources/titlebar.gif", "script.js", "stylesheet.css" ));