Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Fri Oct 04 10:00:28 2013 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Fri Oct 04 13:32:30 2013 -0700
     1.3 @@ -413,7 +413,7 @@
     1.4      protected void addDeprecatedAPI(List<Doc> deprmembers, String headingKey,
     1.5              String tableSummary, String[] tableHeader, Content contentTree) {
     1.6          if (deprmembers.size() > 0) {
     1.7 -            Content table = HtmlTree.TABLE(0, 3, 0, tableSummary,
     1.8 +            Content table = HtmlTree.TABLE(HtmlStyle.deprecatedSummary, 0, 3, 0, tableSummary,
     1.9                  writer.getTableCaption(configuration.getResource(headingKey)));
    1.10              table.addContent(writer.getSummaryTableHeader(tableHeader, "col"));
    1.11              Content tbody = new HtmlTree(HtmlTag.TBODY);
    1.12 @@ -453,7 +453,7 @@
    1.13          List<? extends ProgramElementDoc> members = mems;
    1.14          boolean printedUseTableHeader = false;
    1.15          if (members.size() > 0) {
    1.16 -            Content table = HtmlTree.TABLE(0, 3, 0, tableSummary,
    1.17 +            Content table = HtmlTree.TABLE(HtmlStyle.useSummary, 0, 3, 0, tableSummary,
    1.18                      writer.getTableCaption(heading));
    1.19              Content tbody = new HtmlTree(HtmlTag.TBODY);
    1.20              Iterator<? extends ProgramElementDoc> it = members.iterator();

     2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Fri Oct 04 10:00:28 2013 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Fri Oct 04 13:32:30 2013 -0700
     2.3 @@ -263,7 +263,7 @@
     2.4       * @param contentTree the content tree to which the packages list will be added
     2.5       */
     2.6      protected void addPackageList(Content contentTree) throws IOException {
     2.7 -        Content table = HtmlTree.TABLE(0, 3, 0, useTableSummary,
     2.8 +        Content table = HtmlTree.TABLE(HtmlStyle.useSummary, 0, 3, 0, useTableSummary,
     2.9                  getTableCaption(configuration.getResource(
    2.10                  "doclet.ClassUse_Packages.that.use.0",
    2.11                  getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc
    2.12 @@ -298,7 +298,7 @@
    2.13                  pkgToPackageAnnotations.isEmpty()) {
    2.14              return;
    2.15          }
    2.16 -        Content table = HtmlTree.TABLE(0, 3, 0, useTableSummary,
    2.17 +        Content table = HtmlTree.TABLE(HtmlStyle.useSummary, 0, 3, 0, useTableSummary,
    2.18                  getTableCaption(configuration.getResource(
    2.19                  "doclet.ClassUse_PackageAnnotation",
    2.20                  getLink(new LinkInfoImpl(configuration,

     3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Fri Oct 04 10:00:28 2013 -0700
     3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Fri Oct 04 13:32:30 2013 -0700
     3.3 @@ -207,7 +207,7 @@
     3.4       * @return the table caption and header
     3.5       */
     3.6      protected Content getClassName(Content classStr) {
     3.7 -        Content table = HtmlTree.TABLE(0, 3, 0, constantsTableSummary,
     3.8 +        Content table = HtmlTree.TABLE(HtmlStyle.constantsSummary, 0, 3, 0, constantsTableSummary,
     3.9                  getTableCaption(classStr));
    3.10          table.addContent(getSummaryTableHeader(constantsTableHeader, "col"));
    3.11          return table;

     4.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Fri Oct 04 10:00:28 2013 -0700
     4.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Fri Oct 04 13:32:30 2013 -0700
     4.3 @@ -356,7 +356,7 @@
     4.4          if(classes.length > 0) {
     4.5              Arrays.sort(classes);
     4.6              Content caption = getTableCaption(new RawHtml(label));
     4.7 -            Content table = HtmlTree.TABLE(HtmlStyle.packageSummary, 0, 3, 0,
     4.8 +            Content table = HtmlTree.TABLE(HtmlStyle.typeSummary, 0, 3, 0,
     4.9                      tableSummary, caption);
    4.10              table.addContent(getSummaryTableHeader(tableHeader, "col"));
    4.11              Content tbody = new HtmlTree(HtmlTag.TBODY);
    4.12 @@ -937,7 +937,7 @@
    4.13      protected void addPackageDeprecatedAPI(List<Doc> deprPkgs, String headingKey,
    4.14              String tableSummary, String[] tableHeader, Content contentTree) {
    4.15          if (deprPkgs.size() > 0) {
    4.16 -            Content table = HtmlTree.TABLE(0, 3, 0, tableSummary,
    4.17 +            Content table = HtmlTree.TABLE(HtmlStyle.deprecatedSummary, 0, 3, 0, tableSummary,
    4.18                      getTableCaption(configuration.getResource(headingKey)));
    4.19              table.addContent(getSummaryTableHeader(tableHeader, "col"));
    4.20              Content tbody = new HtmlTree(HtmlTag.TBODY);

     5.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Fri Oct 04 10:00:28 2013 -0700
     5.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Fri Oct 04 13:32:30 2013 -0700
     5.3 @@ -151,7 +151,7 @@
     5.4       * @param contentTree the content tree to which the package list will be added
     5.5       */
     5.6      protected void addPackageList(Content contentTree) throws IOException {
     5.7 -        Content table = HtmlTree.TABLE(0, 3, 0, useTableSummary,
     5.8 +        Content table = HtmlTree.TABLE(HtmlStyle.useSummary, 0, 3, 0, useTableSummary,
     5.9                  getTableCaption(configuration.getResource(
    5.10                  "doclet.ClassUse_Packages.that.use.0",
    5.11                  getPackageLink(pkgdoc, Util.getPackageName(pkgdoc)))));
    5.12 @@ -196,7 +196,7 @@
    5.13              }
    5.14              String tableSummary = configuration.getText("doclet.Use_Table_Summary",
    5.15                      configuration.getText("doclet.classes"));
    5.16 -            Content table = HtmlTree.TABLE(0, 3, 0, tableSummary,
    5.17 +            Content table = HtmlTree.TABLE(HtmlStyle.useSummary, 0, 3, 0, tableSummary,
    5.18                      getTableCaption(configuration.getResource(
    5.19                      "doclet.ClassUse_Classes.in.0.used.by.1",
    5.20                      getPackageLink(pkgdoc, Util.getPackageName(pkgdoc)),

     6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java	Fri Oct 04 10:00:28 2013 -0700
     6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java	Fri Oct 04 13:32:30 2013 -0700
     6.3 @@ -169,7 +169,7 @@
     6.4          if(classes.length > 0) {
     6.5              Arrays.sort(classes);
     6.6              Content caption = getTableCaption(new RawHtml(label));
     6.7 -            Content table = HtmlTree.TABLE(HtmlStyle.packageSummary, 0, 3, 0,
     6.8 +            Content table = HtmlTree.TABLE(HtmlStyle.typeSummary, 0, 3, 0,
     6.9                      tableSummary, caption);
    6.10              table.addContent(getSummaryTableHeader(tableHeader, "col"));
    6.11              Content tbody = new HtmlTree(HtmlTag.TBODY);

     7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Fri Oct 04 10:00:28 2013 -0700
     7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Fri Oct 04 13:32:30 2013 -0700
     7.3 @@ -92,7 +92,7 @@
     7.4          else {
     7.5              caption = getTableCaption(mw.getCaption());
     7.6          }
     7.7 -        Content table = HtmlTree.TABLE(HtmlStyle.overviewSummary, 0, 3, 0,
     7.8 +        Content table = HtmlTree.TABLE(HtmlStyle.memberSummary, 0, 3, 0,
     7.9                  mw.getTableSummary(), caption);
    7.10          table.addContent(getSummaryTableHeader(mw.getSummaryTableHeader(cd), "col"));
    7.11          for (int i = 0; i < tableContents.size(); i++) {

     8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java	Fri Oct 04 10:00:28 2013 -0700
     8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java	Fri Oct 04 13:32:30 2013 -0700
     8.3 @@ -48,8 +48,11 @@
     8.4      colFirst,
     8.5      colLast,
     8.6      colOne,
     8.7 +    constantsSummary,
     8.8      constantValuesContainer,
     8.9      contentContainer,
    8.10 +    deprecatedContent,
    8.11 +    deprecatedSummary,
    8.12      description,
    8.13      details,
    8.14      docSummary,
    8.15 @@ -61,11 +64,11 @@
    8.16      inheritance,
    8.17      italic,
    8.18      legalCopy,
    8.19 +    memberSummary,
    8.20      nameValue,
    8.21      navBarCell1Rev,
    8.22      navList,
    8.23      overviewSummary,
    8.24 -    packageSummary,
    8.25      rowColor,
    8.26      serializedFormContainer,
    8.27      skipNav,
    8.28 @@ -76,9 +79,10 @@
    8.29      subNavList,
    8.30      subTitle,
    8.31      summary,
    8.32 -    deprecatedContent,
    8.33      tabEnd,
    8.34      tableTab,
    8.35      title,
    8.36 -    topNav;
    8.37 +    topNav,
    8.38 +    typeSummary,
    8.39 +    useSummary;
    8.40  }

     9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java	Fri Oct 04 10:00:28 2013 -0700
     9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java	Fri Oct 04 13:32:30 2013 -0700
     9.3 @@ -619,25 +619,6 @@
     9.4      }
     9.5  
     9.6      /**
     9.7 -     * Generates a Table tag with border, width and summary attributes and
     9.8 -     * some content.
     9.9 -     *
    9.10 -     * @param border border for the table
    9.11 -     * @param width width of the table
    9.12 -     * @param summary summary for the table
    9.13 -     * @param body content for the table
    9.14 -     * @return an HtmlTree object for the TABLE tag
    9.15 -     */
    9.16 -    public static HtmlTree TABLE(int border, int width, String summary,
    9.17 -            Content body) {
    9.18 -        HtmlTree htmltree = new HtmlTree(HtmlTag.TABLE, nullCheck(body));
    9.19 -        htmltree.addAttr(HtmlAttr.BORDER, Integer.toString(border));
    9.20 -        htmltree.addAttr(HtmlAttr.WIDTH, Integer.toString(width));
    9.21 -        htmltree.addAttr(HtmlAttr.SUMMARY, nullCheck(summary));
    9.22 -        return htmltree;
    9.23 -    }
    9.24 -
    9.25 -    /**
    9.26       * Generates a Table tag with style class, border, cell padding,
    9.27       * cellspacing and summary attributes and some content.
    9.28       *
    9.29 @@ -662,22 +643,6 @@
    9.30      }
    9.31  
    9.32      /**
    9.33 -     * Generates a Table tag with border, cell padding,
    9.34 -     * cellspacing and summary attributes and some content.
    9.35 -     *
    9.36 -     * @param border border for the table
    9.37 -     * @param cellPadding cell padding for the table
    9.38 -     * @param cellSpacing cell spacing for the table
    9.39 -     * @param summary summary for the table
    9.40 -     * @param body content for the table
    9.41 -     * @return an HtmlTree object for the TABLE tag
    9.42 -     */
    9.43 -    public static HtmlTree TABLE(int border, int cellPadding,
    9.44 -            int cellSpacing, String summary, Content body) {
    9.45 -        return TABLE(null, border, cellPadding, cellSpacing, summary, body);
    9.46 -    }
    9.47 -
    9.48 -    /**
    9.49       * Generates a TD tag with style class attribute and some content.
    9.50       *
    9.51       * @param styleClass style for the tag

    10.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Fri Oct 04 10:00:28 2013 -0700
    10.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css	Fri Oct 04 13:32:30 2013 -0700
    10.3 @@ -348,27 +348,16 @@
    10.4  /*
    10.5  Table styles
    10.6  */
    10.7 -.contentContainer table, .classUseContainer table, .constantValuesContainer table {
    10.8 +.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
    10.9      border-bottom:1px solid #9eadc0;
   10.10 +    margin:0 0 12px 0px;
   10.11      width:100%;
   10.12  }
   10.13 -.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table {
   10.14 -    width:100%;
   10.15 +.overviewSummary, .memberSummary  {
   10.16 +    padding:0px;
   10.17  }
   10.18 -.contentContainer .description table, .contentContainer .details table {
   10.19 -    border-bottom:none;
   10.20 -}
   10.21 -.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{
   10.22 -    vertical-align:top;
   10.23 -    padding-right:20px;
   10.24 -}
   10.25 -.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast,
   10.26 -.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast,
   10.27 -.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne,
   10.28 -.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne {
   10.29 -    padding-right:3px;
   10.30 -}
   10.31 -.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption {
   10.32 +.overviewSummary caption, .memberSummary caption, .typeSummary caption,
   10.33 +.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
   10.34      position:relative;
   10.35      text-align:left;
   10.36      background-repeat:no-repeat;
   10.37 @@ -379,10 +368,18 @@
   10.38      padding:0px;
   10.39      margin:0px;
   10.40  }
   10.41 -caption a:link, caption a:hover, caption a:active, caption a:visited {
   10.42 +.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
   10.43 +.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
   10.44 +.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
   10.45 +.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
   10.46 +.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
   10.47 +.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
   10.48 +.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
   10.49 +.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
   10.50      color:#FFFFFF;
   10.51  }
   10.52 -.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span {
   10.53 +.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
   10.54 +.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
   10.55      white-space:nowrap;
   10.56      padding-top:8px;
   10.57      padding-left:8px;
   10.58 @@ -390,7 +387,7 @@
   10.59      float:left;
   10.60      background-image:url(resources/titlebar.gif);
   10.61  }
   10.62 -.contentContainer ul.blockList li.blockList caption span.activeTableTab span {
   10.63 +.memberSummary caption span.activeTableTab span {
   10.64      white-space:nowrap;
   10.65      padding-top:8px;
   10.66      padding-left:8px;
   10.67 @@ -398,7 +395,7 @@
   10.68      float:left;
   10.69      background-image:url(resources/activetitlebar.gif);
   10.70  }
   10.71 -.contentContainer ul.blockList li.blockList caption span.tableTab span {
   10.72 +.memberSummary caption span.tableTab span {
   10.73      white-space:nowrap;
   10.74      padding-top:8px;
   10.75      padding-left:8px;
   10.76 @@ -406,14 +403,15 @@
   10.77      float:left;
   10.78      background-image:url(resources/titlebar.gif);
   10.79  }
   10.80 -.contentContainer ul.blockList li.blockList caption span.tableTab, .contentContainer ul.blockList li.blockList caption span.activeTableTab {
   10.81 +.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
   10.82      padding-top:0px;
   10.83      padding-left:0px;
   10.84      background-image:none;
   10.85      float:none;
   10.86      display:inline-block;
   10.87  }
   10.88 -.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd {
   10.89 +.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
   10.90 +.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
   10.91      width:10px;
   10.92      background-image:url(resources/titlebar_end.gif);
   10.93      background-repeat:no-repeat;
   10.94 @@ -421,7 +419,7 @@
   10.95      position:relative;
   10.96      float:left;
   10.97  }
   10.98 -.contentContainer ul.blockList li.blockList .activeTableTab .tabEnd {
   10.99 +.memberSummary .activeTableTab .tabEnd {
  10.100      width:10px;
  10.101      margin-right:5px;
  10.102      background-image:url(resources/activetitlebar_end.gif);
  10.103 @@ -430,7 +428,7 @@
  10.104      position:relative;
  10.105      float:left;
  10.106  }
  10.107 -.contentContainer ul.blockList li.blockList .tableTab .tabEnd {
  10.108 +.memberSummary .tableTab .tabEnd {
  10.109      width:10px;
  10.110      margin-right:5px;
  10.111      background-image:url(resources/titlebar_end.gif);
  10.112 @@ -439,33 +437,23 @@
  10.113      position:relative;
  10.114      float:left;
  10.115  }
  10.116 -ul.blockList ul.blockList li.blockList table {
  10.117 -    margin:0 0 12px 0px;
  10.118 -    width:100%;
  10.119 -}
  10.120 -.tableSubHeadingColor {
  10.121 -    background-color: #EEEEFF;
  10.122 -}
  10.123 -.altColor {
  10.124 -    background-color:#eeeeef;
  10.125 -}
  10.126 -.rowColor {
  10.127 -    background-color:#ffffff;
  10.128 -}
  10.129 -.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td {
  10.130 +.overviewSummary td, .memberSummary td, .typeSummary td,
  10.131 +.useSummary td, .constantsSummary td, .deprecatedSummary td {
  10.132      text-align:left;
  10.133      padding:3px 3px 3px 7px;
  10.134  }
  10.135 -th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
  10.136 +th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
  10.137 +td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
  10.138 +    vertical-align:top;
  10.139 +    padding-right:3px;
  10.140 +}
  10.141 +th.colFirst, th.colLast, th.colOne, .constantsSummary th {
  10.142      background:#dee3e9;
  10.143      border-top:1px solid #9eadc0;
  10.144      border-bottom:1px solid #9eadc0;
  10.145      text-align:left;
  10.146      padding:3px 3px 3px 7px;
  10.147  }
  10.148 -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 {
  10.149 -    font-weight:bold;
  10.150 -}
  10.151  td.colFirst, th.colFirst {
  10.152      border-left:1px solid #9eadc0;
  10.153      white-space:nowrap;
  10.154 @@ -477,18 +465,25 @@
  10.155      border-right:1px solid #9eadc0;
  10.156      border-left:1px solid #9eadc0;
  10.157  }
  10.158 -table.overviewSummary  {
  10.159 -    padding:0px;
  10.160 -    margin-left:0px;
  10.161 -}
  10.162 -table.overviewSummary td.colFirst, table.overviewSummary th.colFirst,
  10.163 -table.overviewSummary td.colOne, table.overviewSummary th.colOne {
  10.164 +.overviewSummary td.colFirst, .overviewSummary th.colFirst,
  10.165 +.overviewSummary td.colOne, .overviewSummary th.colOne,
  10.166 +.memberSummary td.colFirst, .memberSummary th.colFirst,
  10.167 +.memberSummary td.colOne, .memberSummary th.colOne,
  10.168 +.typeSummary td.colFirst{
  10.169      width:25%;
  10.170      vertical-align:middle;
  10.171  }
  10.172 -table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
  10.173 -    width:25%;
  10.174 -    vertical-align:middle;
  10.175 +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 {
  10.176 +    font-weight:bold;
  10.177 +}
  10.178 +.tableSubHeadingColor {
  10.179 +    background-color: #EEEEFF;
  10.180 +}
  10.181 +.altColor {
  10.182 +    background-color:#eeeeef;
  10.183 +}
  10.184 +.rowColor {
  10.185 +    background-color:#ffffff;
  10.186  }
  10.187  /*
  10.188  Content styles

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java	Fri Oct 04 13:32:30 2013 -0700
    11.3 @@ -0,0 +1,110 @@
    11.4 +/*
    11.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
    11.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.7 + *
    11.8 + * This code is free software; you can redistribute it and/or modify it
    11.9 + * under the terms of the GNU General Public License version 2 only, as
   11.10 + * published by the Free Software Foundation.
   11.11 + *
   11.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   11.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   11.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   11.15 + * version 2 for more details (a copy is included in the LICENSE file that
   11.16 + * accompanied this code).
   11.17 + *
   11.18 + * You should have received a copy of the GNU General Public License version
   11.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   11.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   11.21 + *
   11.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   11.23 + * or visit www.oracle.com if you need additional information or have any
   11.24 + * questions.
   11.25 + */
   11.26 +
   11.27 +/*
   11.28 + * @test
   11.29 + * @bug 8008164
   11.30 + * @summary Test styles on HTML tables generated by javadoc.
   11.31 + * @author Bhavesh Patel
   11.32 + * @library ../lib/
   11.33 + * @build JavadocTester TestHtmlTableStyles
   11.34 + * @run main TestHtmlTableStyles
   11.35 + */
   11.36 +
   11.37 +public class TestHtmlTableStyles extends JavadocTester {
   11.38 +
   11.39 +    private static final String BUG_ID = "8008164";
   11.40 +
   11.41 +    //Input for string search tests.
   11.42 +    private static final String[][] TEST = {
   11.43 +        {BUG_ID + FS + "pkg1" + FS + "TestTable.html",
   11.44 +            "<table border cellpadding=3 cellspacing=1>"
   11.45 +        },
   11.46 +        {BUG_ID + FS + "pkg1" + FS + "TestTable.html",
   11.47 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   11.48 +            "cellspacing=\"0\" summary=\"Field Summary table, listing fields, " +
   11.49 +            "and an explanation\">"
   11.50 +        },
   11.51 +        {BUG_ID + FS + "pkg1" + FS + "TestTable.html",
   11.52 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   11.53 +            "cellspacing=\"0\" summary=\"Constructor Summary table, listing " +
   11.54 +            "constructors, and an explanation\">"
   11.55 +        },
   11.56 +        {BUG_ID + FS + "pkg1" + FS + "TestTable.html",
   11.57 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   11.58 +            "cellspacing=\"0\" summary=\"Method Summary table, listing methods, " +
   11.59 +            "and an explanation\">"
   11.60 +        },
   11.61 +        {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
   11.62 +            "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" " +
   11.63 +            "cellspacing=\"0\" summary=\"Class Summary table, listing classes, " +
   11.64 +            "and an explanation\">"
   11.65 +        },
   11.66 +        {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "TestTable.html",
   11.67 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" " +
   11.68 +            "cellspacing=\"0\" summary=\"Use table, listing fields, and an explanation\">"
   11.69 +        },
   11.70 +        {BUG_ID + FS + "overview-summary.html",
   11.71 +            "<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
   11.72 +            "cellspacing=\"0\" summary=\"Packages table, listing packages, and an explanation\">"
   11.73 +        },
   11.74 +        {BUG_ID + FS + "deprecated-list.html",
   11.75 +            "<table class=\"deprecatedSummary\" border=\"0\" cellpadding=\"3\" " +
   11.76 +            "cellspacing=\"0\" summary=\"Deprecated Methods table, listing " +
   11.77 +            "deprecated methods, and an explanation\">"
   11.78 +        },
   11.79 +        {BUG_ID + FS + "constant-values.html",
   11.80 +            "<table class=\"constantsSummary\" border=\"0\" cellpadding=\"3\" " +
   11.81 +            "cellspacing=\"0\" summary=\"Constant Field Values table, listing " +
   11.82 +            "constant fields, and values\">"
   11.83 +        },
   11.84 +    };
   11.85 +
   11.86 +    private static final String[] ARGS = new String[] {
   11.87 +        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
   11.88 +    };
   11.89 +
   11.90 +    /**
   11.91 +     * The entry point of the test.
   11.92 +     * @param args the array of command line arguments.
   11.93 +     */
   11.94 +    public static void main(String[] args) throws Exception {
   11.95 +        TestHtmlTableStyles tester = new TestHtmlTableStyles();
   11.96 +        run(tester, ARGS, TEST, NO_TEST);
   11.97 +        tester.printSummary();
   11.98 +    }
   11.99 +
  11.100 +    /**
  11.101 +     * {@inheritDoc}
  11.102 +     */
  11.103 +    public String getBugId() {
  11.104 +        return BUG_ID;
  11.105 +    }
  11.106 +
  11.107 +    /**
  11.108 +     * {@inheritDoc}
  11.109 +     */
  11.110 +    public String getBugName() {
  11.111 +        return getClass().getName();
  11.112 +    }
  11.113 +}

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/test/com/sun/javadoc/testHtmlTableStyles/pkg1/TestTable.java	Fri Oct 04 13:32:30 2013 -0700
    12.3 @@ -0,0 +1,84 @@
    12.4 +/*
    12.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
    12.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.7 + *
    12.8 + * This code is free software; you can redistribute it and/or modify it
    12.9 + * under the terms of the GNU General Public License version 2 only, as
   12.10 + * published by the Free Software Foundation.
   12.11 + *
   12.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   12.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   12.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   12.15 + * version 2 for more details (a copy is included in the LICENSE file that
   12.16 + * accompanied this code).
   12.17 + *
   12.18 + * You should have received a copy of the GNU General Public License version
   12.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   12.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   12.21 + *
   12.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   12.23 + * or visit www.oracle.com if you need additional information or have any
   12.24 + * questions.
   12.25 + */
   12.26 +
   12.27 +package pkg1;
   12.28 +
   12.29 +/**
   12.30 + * Testing table in documentation comment. In the generated documentation, it
   12.31 + * should be displayed as a regular table and not have any styles that the javadoc
   12.32 + * generated tables have.
   12.33 + *
   12.34 + * <table border cellpadding=3 cellspacing=1>
   12.35 + * <caption>Summary of test table</caption>
   12.36 + *  <tr>
   12.37 + *    <td></td>
   12.38 + *    <td align=center colspan = 2> First Element (Head)</td>
   12.39 + *    <td align=center colspan = 2> Last Element (Tail)</td>
   12.40 + *  </tr>
   12.41 + *  <tr>
   12.42 + *    <td></td>
   12.43 + *    <td align=center><em>Throws exception</em></td>
   12.44 + *    <td align=center><em>Special value</em></td>
   12.45 + *    <td align=center><em>Throws exception</em></td>
   12.46 + *    <td align=center><em>Special value</em></td>
   12.47 + *  </tr>
   12.48 + *  <tr>
   12.49 + *    <td>Insert</td>
   12.50 + *    <td>addFirst(e)</td>
   12.51 + *    <td>offerFirst(e)</td>
   12.52 + *    <td>addLast(e)</td>
   12.53 + *    <td>offerLast(e)</td>
   12.54 + *  </tr>
   12.55 + *  <tr>
   12.56 + *    <td>Remove</td>
   12.57 + *    <td>removeFirst()</td>
   12.58 + *    <td>pollFirst()</td>
   12.59 + *    <td>removeLast()</td>
   12.60 + *    <td>pollLast()</td>
   12.61 + *  </tr>
   12.62 + * </table>
   12.63 + */
   12.64 +public class TestTable
   12.65 +{
   12.66 +    /**
   12.67 +     * Field in Class.
   12.68 +     */
   12.69 +    public String field;
   12.70 +
   12.71 +    /**
   12.72 +     * Field constant in Class.
   12.73 +     */
   12.74 +    public static final int fieldCnst = 0;
   12.75 +
   12.76 +    /**
   12.77 +     * Method in Class.
   12.78 +     */
   12.79 +    public void methodInClass(int i) {}
   12.80 +
   12.81 +    /**
   12.82 +     * Deprecated method in Class.
   12.83 +     * @deprecated Do not use it.
   12.84 +     */
   12.85 +    public void deprMethod() {}
   12.86 +
   12.87 +}

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/test/com/sun/javadoc/testHtmlTableStyles/pkg2/TestUse.java	Fri Oct 04 13:32:30 2013 -0700
    13.3 @@ -0,0 +1,34 @@
    13.4 +/*
    13.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
    13.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.7 + *
    13.8 + * This code is free software; you can redistribute it and/or modify it
    13.9 + * under the terms of the GNU General Public License version 2 only, as
   13.10 + * published by the Free Software Foundation.
   13.11 + *
   13.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
   13.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   13.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   13.15 + * version 2 for more details (a copy is included in the LICENSE file that
   13.16 + * accompanied this code).
   13.17 + *
   13.18 + * You should have received a copy of the GNU General Public License version
   13.19 + * 2 along with this work; if not, write to the Free Software Foundation,
   13.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   13.21 + *
   13.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   13.23 + * or visit www.oracle.com if you need additional information or have any
   13.24 + * questions.
   13.25 + */
   13.26 +
   13.27 +package pkg2;
   13.28 +
   13.29 +import pkg1.*;
   13.30 +
   13.31 +/**
   13.32 + * Testing use of TestTable.
   13.33 + */
   13.34 +public class TestUse
   13.35 +{
   13.36 +    public TestTable tTable;
   13.37 +}

    14.1 --- a/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java	Fri Oct 04 10:00:28 2013 -0700
    14.2 +++ b/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java	Fri Oct 04 13:32:30 2013 -0700
    14.3 @@ -1,5 +1,5 @@
    14.4  /*
    14.5 - * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
    14.6 + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
    14.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8   *
    14.9   * This code is free software; you can redistribute it and/or modify it
   14.10 @@ -23,7 +23,7 @@
   14.11  
   14.12  /*
   14.13   * @test
   14.14 - * @bug      6786688
   14.15 + * @bug      6786688 8008164
   14.16   * @summary  HTML tables should have table summary, caption and table headers.
   14.17   * @author   Bhavesh Patel
   14.18   * @library  ../lib/
   14.19 @@ -50,121 +50,121 @@
   14.20  
   14.21          //Package summary
   14.22          {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
   14.23 -            "<table class=\"packageSummary\" border=\"0\" cellpadding=\"3\"" +
   14.24 +            "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
   14.25              " cellspacing=\"0\" summary=\"Class Summary table, " +
   14.26              "listing classes, and an explanation\">"
   14.27          },
   14.28          {BUG_ID + FS + "pkg1" + FS + "package-summary.html",
   14.29 -            "<table class=\"packageSummary\" border=\"0\" cellpadding=\"3\"" +
   14.30 +            "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
   14.31              " cellspacing=\"0\" summary=\"Interface Summary table, " +
   14.32              "listing interfaces, and an explanation\">"
   14.33          },
   14.34          {BUG_ID + FS + "pkg2" + FS + "package-summary.html",
   14.35 -            "<table class=\"packageSummary\" border=\"0\" cellpadding=\"3\"" +
   14.36 +            "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
   14.37              " cellspacing=\"0\" summary=\"Enum Summary table, " +
   14.38              "listing enums, and an explanation\">"
   14.39          },
   14.40          {BUG_ID + FS + "pkg2" + FS + "package-summary.html",
   14.41 -            "<table class=\"packageSummary\" border=\"0\" cellpadding=\"3\"" +
   14.42 +            "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
   14.43              " cellspacing=\"0\" summary=\"Annotation Types Summary table, " +
   14.44              "listing annotation types, and an explanation\">"
   14.45          },
   14.46          // Class documentation
   14.47          {BUG_ID + FS + "pkg1" + FS + "C1.html",
   14.48 -            "<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
   14.49 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   14.50              "cellspacing=\"0\" summary=\"Field Summary table, listing fields, " +
   14.51              "and an explanation\">"
   14.52          },
   14.53          {BUG_ID + FS + "pkg1" + FS + "C1.html",
   14.54 -            "<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
   14.55 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   14.56              "cellspacing=\"0\" summary=\"Method Summary table, listing methods, " +
   14.57              "and an explanation\">"
   14.58          },
   14.59          {BUG_ID + FS + "pkg2" + FS + "C2.html",
   14.60 -            "<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
   14.61 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   14.62              "cellspacing=\"0\" summary=\"Nested Class Summary table, listing " +
   14.63              "nested classes, and an explanation\">"
   14.64          },
   14.65          {BUG_ID + FS + "pkg2" + FS + "C2.html",
   14.66 -            "<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
   14.67 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   14.68              "cellspacing=\"0\" summary=\"Constructor Summary table, listing " +
   14.69              "constructors, and an explanation\">"
   14.70          },
   14.71          {BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html",
   14.72 -            "<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
   14.73 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   14.74              "cellspacing=\"0\" summary=\"Enum Constant Summary table, listing " +
   14.75              "enum constants, and an explanation\">"
   14.76          },
   14.77          {BUG_ID + FS + "pkg2" + FS + "C3.html",
   14.78 -            "<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
   14.79 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   14.80              "cellspacing=\"0\" summary=\"Required Element Summary table, " +
   14.81              "listing required elements, and an explanation\">"
   14.82          },
   14.83          {BUG_ID + FS + "pkg2" + FS + "C4.html",
   14.84 -            "<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
   14.85 +            "<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
   14.86              "cellspacing=\"0\" summary=\"Optional Element Summary table, " +
   14.87              "listing optional elements, and an explanation\">"
   14.88          },
   14.89          // Class use documentation
   14.90          {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "I1.html",
   14.91 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
   14.92 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
   14.93              "table, listing packages, and an explanation\">"
   14.94          },
   14.95          {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
   14.96 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
   14.97 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
   14.98              "table, listing fields, and an explanation\">"
   14.99          },
  14.100          {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
  14.101 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.102 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.103              "table, listing methods, and an explanation\">"
  14.104          },
  14.105          {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html",
  14.106 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.107 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.108              "table, listing fields, and an explanation\">"
  14.109          },
  14.110          {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html",
  14.111 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.112 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.113              "table, listing methods, and an explanation\">"
  14.114          },
  14.115          {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html",
  14.116 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.117 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.118              "table, listing packages, and an explanation\">"
  14.119          },
  14.120          {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html",
  14.121 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.122 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.123              "table, listing methods, and an explanation\">"
  14.124          },
  14.125          // Package use documentation
  14.126          {BUG_ID + FS + "pkg1" + FS + "package-use.html",
  14.127 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.128 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.129              "table, listing packages, and an explanation\">"
  14.130          },
  14.131          {BUG_ID + FS + "pkg1" + FS + "package-use.html",
  14.132 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.133 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.134              "table, listing classes, and an explanation\">"
  14.135          },
  14.136          {BUG_ID + FS + "pkg2" + FS + "package-use.html",
  14.137 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.138 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.139              "table, listing packages, and an explanation\">"
  14.140          },
  14.141          {BUG_ID + FS + "pkg2" + FS + "package-use.html",
  14.142 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.143 +            "<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
  14.144              "table, listing classes, and an explanation\">"
  14.145          },
  14.146          // Deprecated
  14.147          {BUG_ID + FS + "deprecated-list.html",
  14.148 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
  14.149 +            "<table class=\"deprecatedSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
  14.150              "summary=\"Deprecated Fields table, listing deprecated fields, " +
  14.151              "and an explanation\">"
  14.152          },
  14.153          {BUG_ID + FS + "deprecated-list.html",
  14.154 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
  14.155 +            "<table class=\"deprecatedSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
  14.156              "summary=\"Deprecated Methods table, listing deprecated methods, " +
  14.157              "and an explanation\">"
  14.158          },
  14.159          // Constant values
  14.160          {BUG_ID + FS + "constant-values.html",
  14.161 -            "<table border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
  14.162 +            "<table class=\"constantsSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
  14.163              "summary=\"Constant Field Values table, listing " +
  14.164              "constant fields, and values\">"
  14.165          },

    15.1 --- a/test/com/sun/javadoc/testProfiles/TestProfiles.java	Fri Oct 04 10:00:28 2013 -0700
    15.2 +++ b/test/com/sun/javadoc/testProfiles/TestProfiles.java	Fri Oct 04 13:32:30 2013 -0700
    15.3 @@ -23,7 +23,7 @@
    15.4  
    15.5  /*
    15.6   * @test
    15.7 - * @bug      8006124 8009684 8016921 8023700 8024096
    15.8 + * @bug      8006124 8009684 8016921 8023700 8024096 8008164
    15.9   * @summary  Test javadoc support for profiles.
   15.10   * @author   Bhavesh Patel, Evgeniya Stepanova
   15.11   * @library  ../lib/
   15.12 @@ -137,7 +137,7 @@
   15.13          },
   15.14          // need to add teststring when JDK-8015496 will be fixed
   15.15          //Test exception in profiles
   15.16 -        {PROFILE_BUG_ID + FS + "compact1-summary.html","<table class=\"packageSummary\" "
   15.17 +        {PROFILE_BUG_ID + FS + "compact1-summary.html","<table class=\"typeSummary\" "
   15.18              + "border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
   15.19              + "summary=\"Exception Summary table, listing exceptions, and an explanation\">"
   15.20              + NL + "<caption><span>Exception Summary</span><span class=\"tabEnd\">"
   15.21 @@ -149,7 +149,7 @@
   15.22          },
   15.23          //Test errors in profiles
   15.24          {PROFILE_BUG_ID + FS + "compact1-summary.html",
   15.25 -            "<table class=\"packageSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
   15.26 +            "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
   15.27              + "summary=\"Error Summary table, listing errors, and an explanation\">"
   15.28              + NL + "<caption><span>Error Summary</span><span class=\"tabEnd\">&nbsp;"
   15.29              + "</span></caption>" + NL + "<tr>" + NL + "<th class=\"colFirst\""

    16.1 --- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Fri Oct 04 10:00:28 2013 -0700
    16.2 +++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Fri Oct 04 13:32:30 2013 -0700
    16.3 @@ -23,7 +23,7 @@
    16.4  
    16.5  /*
    16.6   * @test
    16.7 - * @bug      4494033 7028815 7052425 8007338 8023608
    16.8 + * @bug      4494033 7028815 7052425 8007338 8023608 8008164
    16.9   * @summary  Run tests on doclet stylesheet.
   16.10   * @author   jamieh
   16.11   * @library  ../lib/
   16.12 @@ -59,10 +59,8 @@
   16.13          {BUG_ID + FS + "stylesheet.css",
   16.14              "ul {" + NL + "    list-style-type:disc;" + NL + "}"},
   16.15          {BUG_ID + FS + "stylesheet.css",
   16.16 -            ".overviewSummary caption, .packageSummary caption, " +
   16.17 -            ".contentContainer ul.blockList li.blockList caption, " +
   16.18 -            ".summary caption, .classUseContainer caption, " +
   16.19 -            ".constantValuesContainer caption {" + NL +
   16.20 +            ".overviewSummary caption, .memberSummary caption, .typeSummary caption," + NL +
   16.21 +            ".useSummary caption, .constantsSummary caption, .deprecatedSummary caption {" + NL +
   16.22              "    position:relative;" + NL +
   16.23              "    text-align:left;" + NL +
   16.24              "    background-repeat:no-repeat;" + NL +
   16.25 @@ -74,10 +72,8 @@
   16.26              "    margin:0px;" + NL +
   16.27              "}"},
   16.28          {BUG_ID + FS + "stylesheet.css",
   16.29 -            ".overviewSummary caption span, .packageSummary caption span, " +
   16.30 -            ".contentContainer ul.blockList li.blockList caption span, " +
   16.31 -            ".summary caption span, .classUseContainer caption span, " +
   16.32 -            ".constantValuesContainer caption span {" + NL +
   16.33 +            ".overviewSummary caption span, .memberSummary caption span, .typeSummary caption span," + NL +
   16.34 +            ".useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {" + NL +
   16.35              "    white-space:nowrap;" + NL +
   16.36              "    padding-top:8px;" + NL +
   16.37              "    padding-left:8px;" + NL +
   16.38 @@ -86,8 +82,7 @@
   16.39              "    background-image:url(resources/titlebar.gif);" + NL +
   16.40              "}"},
   16.41          {BUG_ID + FS + "stylesheet.css",
   16.42 -            ".contentContainer ul.blockList li.blockList caption " +
   16.43 -            "span.activeTableTab span {" + NL +
   16.44 +            ".memberSummary caption span.activeTableTab span {" + NL +
   16.45              "    white-space:nowrap;" + NL +
   16.46              "    padding-top:8px;" + NL +
   16.47              "    padding-left:8px;" + NL +
   16.48 @@ -96,7 +91,7 @@
   16.49              "    background-image:url(resources/activetitlebar.gif);" + NL +
   16.50              "}"},
   16.51          {BUG_ID + FS + "stylesheet.css",
   16.52 -            ".contentContainer ul.blockList li.blockList caption span.tableTab span {" + NL +
   16.53 +            ".memberSummary caption span.tableTab span {" + NL +
   16.54              "    white-space:nowrap;" + NL +
   16.55              "    padding-top:8px;" + NL +
   16.56              "    padding-left:8px;" + NL +
   16.57 @@ -105,8 +100,7 @@
   16.58              "    background-image:url(resources/titlebar.gif);" + NL +
   16.59              "}"},
   16.60          {BUG_ID + FS + "stylesheet.css",
   16.61 -            ".contentContainer ul.blockList li.blockList caption span.tableTab, " +
   16.62 -            ".contentContainer ul.blockList li.blockList caption span.activeTableTab {" + NL +
   16.63 +            ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {" + NL +
   16.64              "    padding-top:0px;" + NL +
   16.65              "    padding-left:0px;" + NL +
   16.66              "    background-image:none;" + NL +