langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
changeset 41157 b235a429089a
parent 40606 eb2c81860c86
child 41452 ddaef4bba083
equal deleted inserted replaced
41156:251471aec877 41157:b235a429089a
   403                     !configuration.isGeneratedDoc(te)) {
   403                     !configuration.isGeneratedDoc(te)) {
   404                     continue;
   404                     continue;
   405                 }
   405                 }
   406                 Content classContent = getLink(new LinkInfoImpl(
   406                 Content classContent = getLink(new LinkInfoImpl(
   407                         configuration, LinkInfoImpl.Kind.PACKAGE, te));
   407                         configuration, LinkInfoImpl.Kind.PACKAGE, te));
   408                 Content tdClass = HtmlTree.TD(HtmlStyle.colFirst, classContent);
   408                 Content tdClass = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, classContent);
   409                 HtmlTree tr = HtmlTree.TR(tdClass);
   409                 HtmlTree tr = HtmlTree.TR(tdClass);
   410                 tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
   410                 tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
   411                 altColor = !altColor;
   411                 altColor = !altColor;
   412                 HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD);
   412                 HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD);
   413                 tdClassDescription.addStyle(HtmlStyle.colLast);
   413                 tdClassDescription.addStyle(HtmlStyle.colLast);
   940      */
   940      */
   941     public Content getSummaryTableHeader(List<String> header, String scope) {
   941     public Content getSummaryTableHeader(List<String> header, String scope) {
   942         Content tr = new HtmlTree(HtmlTag.TR);
   942         Content tr = new HtmlTree(HtmlTag.TR);
   943         final int size = header.size();
   943         final int size = header.size();
   944         Content tableHeader;
   944         Content tableHeader;
   945         if (size == 1) {
   945         if (size == 2) {
   946             tableHeader = new StringContent(header.get(0));
   946             tableHeader = new StringContent(header.get(0));
   947             tr.addContent(HtmlTree.TH(HtmlStyle.colOne, scope, tableHeader));
   947             tr.addContent(HtmlTree.TH(HtmlStyle.colFirst, scope, tableHeader));
       
   948             tableHeader = new StringContent(header.get(1));
       
   949             tr.addContent(HtmlTree.TH(HtmlStyle.colLast, scope, tableHeader));
   948             return tr;
   950             return tr;
   949         }
   951         }
   950         for (int i = 0; i < size; i++) {
   952         for (int i = 0; i < size; i++) {
   951             tableHeader = new StringContent(header.get(i));
   953             tableHeader = new StringContent(header.get(i));
   952             if(i == 0)
   954             if (i == 0)
   953                 tr.addContent(HtmlTree.TH(HtmlStyle.colFirst, scope, tableHeader));
   955                 tr.addContent(HtmlTree.TH(HtmlStyle.colFirst, scope, tableHeader));
   954             else if(i == (size - 1))
   956             else if (i == 1)
       
   957                 tr.addContent(HtmlTree.TH(HtmlStyle.colSecond, scope, tableHeader));
       
   958             else if (i == (size - 1))
   955                 tr.addContent(HtmlTree.TH(HtmlStyle.colLast, scope, tableHeader));
   959                 tr.addContent(HtmlTree.TH(HtmlStyle.colLast, scope, tableHeader));
   956             else
   960             else
   957                 tr.addContent(HtmlTree.TH(scope, tableHeader));
   961                 tr.addContent(HtmlTree.TH(scope, tableHeader));
   958         }
   962         }
   959         return tr;
   963         return tr;
  1060             table.addContent(getSummaryTableHeader(tableHeader, "col"));
  1064             table.addContent(getSummaryTableHeader(tableHeader, "col"));
  1061             Content tbody = new HtmlTree(HtmlTag.TBODY);
  1065             Content tbody = new HtmlTree(HtmlTag.TBODY);
  1062             boolean altColor = true;
  1066             boolean altColor = true;
  1063             for (Element e : deprPkgs) {
  1067             for (Element e : deprPkgs) {
  1064                 PackageElement pkg = (PackageElement) e;
  1068                 PackageElement pkg = (PackageElement) e;
  1065                 HtmlTree td = HtmlTree.TD(HtmlStyle.colOne,
  1069                 HtmlTree thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst,
  1066                         getPackageLink(pkg, getPackageName(pkg)));
  1070                         getPackageLink(pkg, getPackageName(pkg)));
       
  1071                 HtmlTree tr = HtmlTree.TR(thRow);
       
  1072                 HtmlTree tdDesc = new HtmlTree(HtmlTag.TD);
       
  1073                 tdDesc.addStyle(HtmlStyle.colLast);
  1067                 List<? extends DocTree> tags = utils.getDeprecatedTrees(pkg);
  1074                 List<? extends DocTree> tags = utils.getDeprecatedTrees(pkg);
  1068                 if (!tags.isEmpty()) {
  1075                 if (!tags.isEmpty()) {
  1069                     addInlineDeprecatedComment(pkg, tags.get(0), td);
  1076                     addInlineDeprecatedComment(pkg, tags.get(0), tdDesc);
  1070                 }
  1077                 }
  1071                 HtmlTree tr = HtmlTree.TR(td);
  1078                 tr.addContent(tdDesc);
  1072                 tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
  1079                 tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
  1073                 altColor = !altColor;
  1080                 altColor = !altColor;
  1074                 tbody.addContent(tr);
  1081                 tbody.addContent(tr);
  1075             }
  1082             }
  1076             table.addContent(tbody);
  1083             table.addContent(tbody);