changeset 2824:1b5c1541d70a

Merge
author asaha
date Wed, 25 Mar 2015 11:37:48 -0700
parents b9e5fab44d53 1f6454abd0e6
children 6561609f52ab
files .hgtags
diffstat 3 files changed, 22 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Mar 18 18:31:58 2015 -0700
+++ b/.hgtags	Wed Mar 25 11:37:48 2015 -0700
@@ -402,3 +402,4 @@
 fc98314cff57ce33bfe3093441804ee0a3446622 jdk8u60-b05
 44d168f9ad16609062e359ee70c6699ec4525b45 jdk8u60-b06
 39b47ffeb7780407561c0b189c3b3ab497868518 jdk8u60-b07
+e5b93c508212e0db2301cc25f5ada882367d1d9b jdk8u60-b08
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Mar 18 18:31:58 2015 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Mar 25 11:37:48 2015 -0700
@@ -463,7 +463,6 @@
 .useSummary td, .constantsSummary td, .deprecatedSummary td {
     text-align:left;
     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{
@@ -488,6 +487,7 @@
     font-size:13px;
 }
 .overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
 .overviewSummary td.colOne, .overviewSummary th.colOne,
 .memberSummary td.colFirst, .memberSummary th.colFirst,
 .memberSummary td.colOne, .memberSummary th.colOne,
--- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Wed Mar 18 18:31:58 2015 -0700
+++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Wed Mar 25 11:37:48 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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      4494033 7028815 7052425 8007338 8023608 8008164 8016549
+ * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461
  * @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-7052425-8007338";
+    private static final String BUG_ID = "4494033-7028815-7052425-8007338-8072461";
 
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
@@ -123,6 +123,23 @@
             "}"},
         {BUG_ID + FS + "stylesheet.css",
             "@import url('resources/fonts/dejavu.css');"},
+        // Test the formatting styles for proper content display in use and constant values pages.
+        {BUG_ID + FS + "stylesheet.css",
+            ".overviewSummary td.colFirst, .overviewSummary th.colFirst," + NL +
+            ".useSummary td.colFirst, .useSummary th.colFirst," + NL +
+            ".overviewSummary td.colOne, .overviewSummary th.colOne," + NL +
+            ".memberSummary td.colFirst, .memberSummary th.colFirst," + NL +
+            ".memberSummary td.colOne, .memberSummary th.colOne," + NL +
+            ".typeSummary td.colFirst{" + NL +
+            "    width:25%;" + NL +
+            "    vertical-align:top;" + NL +
+            "}"},
+        {BUG_ID + FS + "stylesheet.css",
+            ".overviewSummary td, .memberSummary td, .typeSummary td," + NL +
+            ".useSummary td, .constantsSummary td, .deprecatedSummary td {" + NL +
+            "    text-align:left;" + NL +
+            "    padding:0px 0px 12px 10px;" + NL +
+            "}"},
         // Test whether a link to the stylesheet file is inserted properly
         // in the class documentation.
         {BUG_ID + FS + "pkg" + FS + "A.html",