Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Jun 26 18:03:58 2013 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Wed Jun 26 20:38:21 2013 -0700
     1.3 @@ -371,6 +371,7 @@
     1.4      overflow:hidden;
     1.5      padding:0px;
     1.6      margin:0px;
     1.7 +    white-space:pre;
     1.8  }
     1.9  caption a:link, caption a:hover, caption a:active, caption a:visited {
    1.10      color:#FFFFFF;

     2.1 --- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Wed Jun 26 18:03:58 2013 -0700
     2.2 +++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Wed Jun 26 20:38:21 2013 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2005, 2013, 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
    2.15 + * @bug      4494033 7028815 7052425 8007338
    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";
    2.24 +    private static final String BUG_ID = "4494033-7028815-7052425-8007338";
    2.25  
    2.26      //Javadoc arguments.
    2.27      private static final String[] ARGS = new String[] {
    2.28 @@ -44,29 +44,45 @@
    2.29      //Input for string search tests.
    2.30      private static final String[][] TEST = {
    2.31          {BUG_ID + FS + "stylesheet.css",
    2.32 -                "/* Javadoc style sheet */"},
    2.33 +            "/* Javadoc style sheet */"},
    2.34          {BUG_ID + FS + "stylesheet.css",
    2.35 -                "/*" + NL + "Overall document style" + NL + "*/"},
    2.36 +            "/*" + NL + "Overall document style" + NL + "*/"},
    2.37          {BUG_ID + FS + "stylesheet.css",
    2.38 -                "/*" + NL + "Heading styles" + NL + "*/"},
    2.39 +            "/*" + NL + "Heading styles" + NL + "*/"},
    2.40          {BUG_ID + FS + "stylesheet.css",
    2.41 -                "/*" + NL + "Navigation bar styles" + NL + "*/"},
    2.42 +            "/*" + NL + "Navigation bar styles" + NL + "*/"},
    2.43          {BUG_ID + FS + "stylesheet.css",
    2.44 -                "body {" + NL + "    background-color:#ffffff;" + NL +
    2.45 -                "    color:#353833;" + NL +
    2.46 -                "    font-family:Arial, Helvetica, sans-serif;" + NL +
    2.47 -                "    font-size:76%;" + NL + "    margin:0;" + NL + "}"},
    2.48 +            "body {" + NL + "    background-color:#ffffff;" + NL +
    2.49 +            "    color:#353833;" + NL +
    2.50 +            "    font-family:Arial, Helvetica, sans-serif;" + NL +
    2.51 +            "    font-size:76%;" + NL + "    margin:0;" + NL + "}"},
    2.52          {BUG_ID + FS + "stylesheet.css",
    2.53 -                "ul {" + NL + "    list-style-type:disc;" + NL + "}"},
    2.54 +            "ul {" + NL + "    list-style-type:disc;" + NL + "}"},
    2.55 +        {BUG_ID + FS + "stylesheet.css",
    2.56 +            ".overviewSummary caption, .packageSummary caption, " +
    2.57 +            ".contentContainer ul.blockList li.blockList caption, " +
    2.58 +            ".summary caption, .classUseContainer caption, " +
    2.59 +            ".constantValuesContainer caption {" + NL +
    2.60 +            "    position:relative;" + NL +
    2.61 +            "    text-align:left;" + NL +
    2.62 +            "    background-repeat:no-repeat;" + NL +
    2.63 +            "    color:#FFFFFF;" + NL +
    2.64 +            "    font-weight:bold;" + NL +
    2.65 +            "    clear:none;" + NL +
    2.66 +            "    overflow:hidden;" + NL +
    2.67 +            "    padding:0px;" + NL +
    2.68 +            "    margin:0px;" + NL +
    2.69 +            "    white-space:pre;" + NL +
    2.70 +            "}"},
    2.71          // Test whether a link to the stylesheet file is inserted properly
    2.72          // in the class documentation.
    2.73          {BUG_ID + FS + "pkg" + FS + "A.html",
    2.74 -                "<link rel=\"stylesheet\" type=\"text/css\" " +
    2.75 -                "href=\"../stylesheet.css\" title=\"Style\">"}
    2.76 +            "<link rel=\"stylesheet\" type=\"text/css\" " +
    2.77 +            "href=\"../stylesheet.css\" title=\"Style\">"}
    2.78      };
    2.79      private static final String[][] NEGATED_TEST = {
    2.80          {BUG_ID + FS + "stylesheet.css",
    2.81 -                "* {" + NL + "    margin:0;" + NL + "    padding:0;" + NL + "}"}
    2.82 +            "* {" + NL + "    margin:0;" + NL + "    padding:0;" + NL + "}"}
    2.83      };
    2.84  
    2.85      /**