1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Tue Mar 17 11:28:24 2009 -0700
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Thu Mar 19 19:00:54 2009 -0700
1.3 @@ -60,7 +60,11 @@
1.4
1.5 /*** abstracts ***/
1.6
1.7 - public abstract void printSummaryLabel(ClassDoc cd);
1.8 + public abstract void printSummaryLabel();
1.9 +
1.10 + public abstract void printTableSummary();
1.11 +
1.12 + public abstract void printSummaryTableHeader(ProgramElementDoc member);
1.13
1.14 public abstract void printInheritedSummaryLabel(ClassDoc cd);
1.15
1.16 @@ -342,12 +346,13 @@
1.17 * format for listing the API. Call methods from the sub-class to complete
1.18 * the generation.
1.19 */
1.20 - protected void printDeprecatedAPI(List<Doc> deprmembers, String headingKey) {
1.21 + protected void printDeprecatedAPI(List<Doc> deprmembers, String headingKey, String tableSummary, String[] tableHeader) {
1.22 if (deprmembers.size() > 0) {
1.23 - writer.tableIndexSummary();
1.24 - writer.tableHeaderStart("#CCCCFF");
1.25 - writer.strongText(headingKey);
1.26 - writer.tableHeaderEnd();
1.27 + writer.tableIndexSummary(tableSummary);
1.28 + writer.tableCaptionStart();
1.29 + writer.printText(headingKey);
1.30 + writer.tableCaptionEnd();
1.31 + writer.summaryTableHeader(tableHeader, "col");
1.32 for (int i = 0; i < deprmembers.size(); i++) {
1.33 ProgramElementDoc member =(ProgramElementDoc)deprmembers.get(i);
1.34 writer.trBgcolorStyle("white", "TableRowColor");
1.35 @@ -370,19 +375,26 @@
1.36 /**
1.37 * Print use info.
1.38 */
1.39 - protected void printUseInfo(List<? extends ProgramElementDoc> mems, String heading) {
1.40 + protected void printUseInfo(List<? extends ProgramElementDoc> mems, String heading, String tableSummary) {
1.41 if (mems == null) {
1.42 return;
1.43 }
1.44 List<? extends ProgramElementDoc> members = mems;
1.45 + boolean printedUseTableHeader = false;
1.46 if (members.size() > 0) {
1.47 - writer.tableIndexSummary();
1.48 - writer.tableUseInfoHeaderStart("#CCCCFF");
1.49 + writer.tableIndexSummary(tableSummary);
1.50 + writer.tableSubCaptionStart();
1.51 writer.print(heading);
1.52 - writer.tableHeaderEnd();
1.53 + writer.tableCaptionEnd();
1.54 for (Iterator<? extends ProgramElementDoc> it = members.iterator(); it.hasNext(); ) {
1.55 ProgramElementDoc pgmdoc = it.next();
1.56 ClassDoc cd = pgmdoc.containingClass();
1.57 + if (!printedUseTableHeader) {
1.58 + // Passing ProgramElementDoc helps decides printing
1.59 + // interface or class header in case of nested classes.
1.60 + this.printSummaryTableHeader(pgmdoc);
1.61 + printedUseTableHeader = true;
1.62 + }
1.63
1.64 writer.printSummaryLinkType(this, pgmdoc);
1.65 if (cd != null && !(pgmdoc instanceof ConstructorDoc)
