Wed, 18 Mar 2015 18:20:37 -0700
Merge
1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Mar 18 13:57:03 2015 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css Wed Mar 18 18:20:37 2015 -0700 1.3 @@ -463,7 +463,6 @@ 1.4 .useSummary td, .constantsSummary td, .deprecatedSummary td { 1.5 text-align:left; 1.6 padding:0px 0px 12px 10px; 1.7 - width:100%; 1.8 } 1.9 th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th, 1.10 td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{ 1.11 @@ -488,6 +487,7 @@ 1.12 font-size:13px; 1.13 } 1.14 .overviewSummary td.colFirst, .overviewSummary th.colFirst, 1.15 +.useSummary td.colFirst, .useSummary th.colFirst, 1.16 .overviewSummary td.colOne, .overviewSummary th.colOne, 1.17 .memberSummary td.colFirst, .memberSummary th.colFirst, 1.18 .memberSummary td.colOne, .memberSummary th.colOne,
2.1 --- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Wed Mar 18 13:57:03 2015 -0700 2.2 +++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Wed Mar 18 18:20:37 2015 -0700 2.3 @@ -1,5 +1,5 @@ 2.4 /* 2.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 2.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 * 2.9 * This code is free software; you can redistribute it and/or modify it 2.10 @@ -23,7 +23,7 @@ 2.11 2.12 /* 2.13 * @test 2.14 - * @bug 4494033 7028815 7052425 8007338 8023608 8008164 8016549 2.15 + * @bug 4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461 2.16 * @summary Run tests on doclet stylesheet. 2.17 * @author jamieh 2.18 * @library ../lib/ 2.19 @@ -34,7 +34,7 @@ 2.20 public class TestStylesheet extends JavadocTester { 2.21 2.22 //Test information. 2.23 - private static final String BUG_ID = "4494033-7028815-7052425-8007338"; 2.24 + private static final String BUG_ID = "4494033-7028815-7052425-8007338-8072461"; 2.25 2.26 //Javadoc arguments. 2.27 private static final String[] ARGS = new String[] { 2.28 @@ -123,6 +123,23 @@ 2.29 "}"}, 2.30 {BUG_ID + FS + "stylesheet.css", 2.31 "@import url('resources/fonts/dejavu.css');"}, 2.32 + // Test the formatting styles for proper content display in use and constant values pages. 2.33 + {BUG_ID + FS + "stylesheet.css", 2.34 + ".overviewSummary td.colFirst, .overviewSummary th.colFirst," + NL + 2.35 + ".useSummary td.colFirst, .useSummary th.colFirst," + NL + 2.36 + ".overviewSummary td.colOne, .overviewSummary th.colOne," + NL + 2.37 + ".memberSummary td.colFirst, .memberSummary th.colFirst," + NL + 2.38 + ".memberSummary td.colOne, .memberSummary th.colOne," + NL + 2.39 + ".typeSummary td.colFirst{" + NL + 2.40 + " width:25%;" + NL + 2.41 + " vertical-align:top;" + NL + 2.42 + "}"}, 2.43 + {BUG_ID + FS + "stylesheet.css", 2.44 + ".overviewSummary td, .memberSummary td, .typeSummary td," + NL + 2.45 + ".useSummary td, .constantsSummary td, .deprecatedSummary td {" + NL + 2.46 + " text-align:left;" + NL + 2.47 + " padding:0px 0px 12px 10px;" + NL + 2.48 + "}"}, 2.49 // Test whether a link to the stylesheet file is inserted properly 2.50 // in the class documentation. 2.51 {BUG_ID + FS + "pkg" + FS + "A.html",