Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/.hgtags	Wed Mar 18 18:31:58 2015 -0700
     1.2 +++ b/.hgtags	Wed Mar 25 11:37:48 2015 -0700
     1.3 @@ -402,3 +402,4 @@
     1.4  fc98314cff57ce33bfe3093441804ee0a3446622 jdk8u60-b05
     1.5  44d168f9ad16609062e359ee70c6699ec4525b45 jdk8u60-b06
     1.6  39b47ffeb7780407561c0b189c3b3ab497868518 jdk8u60-b07
     1.7 +e5b93c508212e0db2301cc25f5ada882367d1d9b jdk8u60-b08

     2.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Mar 18 18:31:58 2015 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Mar 25 11:37:48 2015 -0700
     2.3 @@ -463,7 +463,6 @@
     2.4  .useSummary td, .constantsSummary td, .deprecatedSummary td {
     2.5      text-align:left;
     2.6      padding:0px 0px 12px 10px;
     2.7 -    width:100%;
     2.8  }
     2.9  th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
    2.10  td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
    2.11 @@ -488,6 +487,7 @@
    2.12      font-size:13px;
    2.13  }
    2.14  .overviewSummary td.colFirst, .overviewSummary th.colFirst,
    2.15 +.useSummary td.colFirst, .useSummary th.colFirst,
    2.16  .overviewSummary td.colOne, .overviewSummary th.colOne,
    2.17  .memberSummary td.colFirst, .memberSummary th.colFirst,
    2.18  .memberSummary td.colOne, .memberSummary th.colOne,

     3.1 --- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Wed Mar 18 18:31:58 2015 -0700
     3.2 +++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Wed Mar 25 11:37:48 2015 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -23,7 +23,7 @@
    3.11  
    3.12  /*
    3.13   * @test
    3.14 - * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549
    3.15 + * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461
    3.16   * @summary  Run tests on doclet stylesheet.
    3.17   * @author   jamieh
    3.18   * @library  ../lib/
    3.19 @@ -34,7 +34,7 @@
    3.20  public class TestStylesheet extends JavadocTester {
    3.21  
    3.22      //Test information.
    3.23 -    private static final String BUG_ID = "4494033-7028815-7052425-8007338";
    3.24 +    private static final String BUG_ID = "4494033-7028815-7052425-8007338-8072461";
    3.25  
    3.26      //Javadoc arguments.
    3.27      private static final String[] ARGS = new String[] {
    3.28 @@ -123,6 +123,23 @@
    3.29              "}"},
    3.30          {BUG_ID + FS + "stylesheet.css",
    3.31              "@import url('resources/fonts/dejavu.css');"},
    3.32 +        // Test the formatting styles for proper content display in use and constant values pages.
    3.33 +        {BUG_ID + FS + "stylesheet.css",
    3.34 +            ".overviewSummary td.colFirst, .overviewSummary th.colFirst," + NL +
    3.35 +            ".useSummary td.colFirst, .useSummary th.colFirst," + NL +
    3.36 +            ".overviewSummary td.colOne, .overviewSummary th.colOne," + NL +
    3.37 +            ".memberSummary td.colFirst, .memberSummary th.colFirst," + NL +
    3.38 +            ".memberSummary td.colOne, .memberSummary th.colOne," + NL +
    3.39 +            ".typeSummary td.colFirst{" + NL +
    3.40 +            "    width:25%;" + NL +
    3.41 +            "    vertical-align:top;" + NL +
    3.42 +            "}"},
    3.43 +        {BUG_ID + FS + "stylesheet.css",
    3.44 +            ".overviewSummary td, .memberSummary td, .typeSummary td," + NL +
    3.45 +            ".useSummary td, .constantsSummary td, .deprecatedSummary td {" + NL +
    3.46 +            "    text-align:left;" + NL +
    3.47 +            "    padding:0px 0px 12px 10px;" + NL +
    3.48 +            "}"},
    3.49          // Test whether a link to the stylesheet file is inserted properly
    3.50          // in the class documentation.
    3.51          {BUG_ID + FS + "pkg" + FS + "A.html",