Mercurial > jdk8-mips64-public > langtools / changeset
changeset
Merge
Tue, 31 Mar 2009 08:54:12 -0700
- author
- xdono
- date
- Tue, 31 Mar 2009 08:54:12 -0700
- changeset 247
- 72c2df1a2b5a
- parent 246
- 1ec9ff434ce2
- parent 245
- 3bf905cb80e7
- child 249
- dbdeb4a7581b
Merge
1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Fri Mar 27 14:11:53 2009 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Tue Mar 31 08:54:12 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)
2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Fri Mar 27 14:11:53 2009 -0700 2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Tue Mar 31 08:54:12 2009 -0700 2.3 @@ -35,6 +35,7 @@ 2.4 * generate overview-frame.html as well as overview-summary.html. 2.5 * 2.6 * @author Atul M Dambalkar 2.7 + * @author Bhavesh Patel (Modified) 2.8 */ 2.9 public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter { 2.10 2.11 @@ -61,7 +62,7 @@ 2.12 2.13 protected abstract void printOverviewHeader(); 2.14 2.15 - protected abstract void printIndexHeader(String text); 2.16 + protected abstract void printIndexHeader(String text, String tableSummary); 2.17 2.18 protected abstract void printIndexRow(PackageDoc pkg); 2.19 2.20 @@ -101,7 +102,10 @@ 2.21 * Generate the frame or non-frame package index. 2.22 */ 2.23 protected void generateIndex() { 2.24 - printIndexContents(packages, "doclet.Package_Summary"); 2.25 + printIndexContents(packages, "doclet.Package_Summary", 2.26 + configuration.getText("doclet.Member_Table_Summary", 2.27 + configuration.getText("doclet.Package_Summary"), 2.28 + configuration.getText("doclet.packages"))); 2.29 } 2.30 2.31 /** 2.32 @@ -111,10 +115,10 @@ 2.33 * @param packages Array of packages to be documented. 2.34 * @param text String which will be used as the heading. 2.35 */ 2.36 - protected void printIndexContents(PackageDoc[] packages, String text) { 2.37 + protected void printIndexContents(PackageDoc[] packages, String text, String tableSummary) { 2.38 if (packages.length > 0) { 2.39 Arrays.sort(packages); 2.40 - printIndexHeader(text); 2.41 + printIndexHeader(text, tableSummary); 2.42 printAllClassesPackagesLink(); 2.43 for(int i = 0; i < packages.length; i++) { 2.44 if (packages[i] != null) {
3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Fri Mar 27 14:11:53 2009 -0700 3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Tue Mar 31 08:54:12 2009 -0700 3.3 @@ -34,6 +34,7 @@ 3.4 * Writes annotation type optional member documentation in HTML format. 3.5 * 3.6 * @author Jamie Ho 3.7 + * @author Bhavesh Patel (Modified) 3.8 */ 3.9 public class AnnotationTypeOptionalMemberWriterImpl extends 3.10 AnnotationTypeRequiredMemberWriterImpl 3.11 @@ -89,8 +90,27 @@ 3.12 /** 3.13 * {@inheritDoc} 3.14 */ 3.15 - public void printSummaryLabel(ClassDoc cd) { 3.16 - writer.strongText("doclet.Annotation_Type_Optional_Member_Summary"); 3.17 + public void printSummaryLabel() { 3.18 + writer.printText("doclet.Annotation_Type_Optional_Member_Summary"); 3.19 + } 3.20 + 3.21 + /** 3.22 + * {@inheritDoc} 3.23 + */ 3.24 + public void printTableSummary() { 3.25 + writer.tableIndexSummary(configuration().getText("doclet.Member_Table_Summary", 3.26 + configuration().getText("doclet.Annotation_Type_Optional_Member_Summary"), 3.27 + configuration().getText("doclet.annotation_type_optional_members"))); 3.28 + } 3.29 + 3.30 + public void printSummaryTableHeader(ProgramElementDoc member) { 3.31 + String[] header = new String[] { 3.32 + writer.getModifierTypeHeader(), 3.33 + configuration().getText("doclet.0_and_1", 3.34 + configuration().getText("doclet.Annotation_Type_Optional_Member"), 3.35 + configuration().getText("doclet.Description")) 3.36 + }; 3.37 + writer.summaryTableHeader(header, "col"); 3.38 } 3.39 3.40 /**
4.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Fri Mar 27 14:11:53 2009 -0700 4.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Tue Mar 31 08:54:12 2009 -0700 4.3 @@ -34,6 +34,7 @@ 4.4 * Writes annotation type required member documentation in HTML format. 4.5 * 4.6 * @author Jamie Ho 4.7 + * @author Bhavesh Patel (Modified) 4.8 */ 4.9 public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter 4.10 implements AnnotationTypeRequiredMemberWriter, MemberSummaryWriter { 4.11 @@ -178,8 +179,27 @@ 4.12 /** 4.13 * {@inheritDoc} 4.14 */ 4.15 - public void printSummaryLabel(ClassDoc cd) { 4.16 - writer.strongText("doclet.Annotation_Type_Required_Member_Summary"); 4.17 + public void printSummaryLabel() { 4.18 + writer.printText("doclet.Annotation_Type_Required_Member_Summary"); 4.19 + } 4.20 + 4.21 + /** 4.22 + * {@inheritDoc} 4.23 + */ 4.24 + public void printTableSummary() { 4.25 + writer.tableIndexSummary(configuration().getText("doclet.Member_Table_Summary", 4.26 + configuration().getText("doclet.Annotation_Type_Required_Member_Summary"), 4.27 + configuration().getText("doclet.annotation_type_required_members"))); 4.28 + } 4.29 + 4.30 + public void printSummaryTableHeader(ProgramElementDoc member) { 4.31 + String[] header = new String[] { 4.32 + writer.getModifierTypeHeader(), 4.33 + configuration().getText("doclet.0_and_1", 4.34 + configuration().getText("doclet.Annotation_Type_Required_Member"), 4.35 + configuration().getText("doclet.Description")) 4.36 + }; 4.37 + writer.summaryTableHeader(header, "col"); 4.38 } 4.39 4.40 /**
5.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Fri Mar 27 14:11:53 2009 -0700 5.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Tue Mar 31 08:54:12 2009 -0700 5.3 @@ -34,6 +34,7 @@ 5.4 * Generate class usage information. 5.5 * 5.6 * @author Robert G. Field 5.7 + * @author Bhavesh Patel (Modified) 5.8 */ 5.9 public class ClassUseWriter extends SubWriterHolderWriter { 5.10 5.11 @@ -65,6 +66,13 @@ 5.12 final ConstructorWriterImpl constrSubWriter; 5.13 final FieldWriterImpl fieldSubWriter; 5.14 final NestedClassWriterImpl classSubWriter; 5.15 + // Summary for various use tables. 5.16 + final String classUseTableSummary; 5.17 + final String subclassUseTableSummary; 5.18 + final String subinterfaceUseTableSummary; 5.19 + final String fieldUseTableSummary; 5.20 + final String methodUseTableSummary; 5.21 + final String constructorUseTableSummary; 5.22 5.23 5.24 /** 5.25 @@ -116,6 +124,18 @@ 5.26 constrSubWriter = new ConstructorWriterImpl(this); 5.27 fieldSubWriter = new FieldWriterImpl(this); 5.28 classSubWriter = new NestedClassWriterImpl(this); 5.29 + classUseTableSummary = configuration.getText("doclet.Use_Table_Summary", 5.30 + configuration.getText("doclet.classes")); 5.31 + subclassUseTableSummary = configuration.getText("doclet.Use_Table_Summary", 5.32 + configuration.getText("doclet.subclasses")); 5.33 + subinterfaceUseTableSummary = configuration.getText("doclet.Use_Table_Summary", 5.34 + configuration.getText("doclet.subinterfaces")); 5.35 + fieldUseTableSummary = configuration.getText("doclet.Use_Table_Summary", 5.36 + configuration.getText("doclet.fields")); 5.37 + methodUseTableSummary = configuration.getText("doclet.Use_Table_Summary", 5.38 + configuration.getText("doclet.methods")); 5.39 + constructorUseTableSummary = configuration.getText("doclet.Use_Table_Summary", 5.40 + configuration.getText("doclet.constructors")); 5.41 } 5.42 5.43 /** 5.44 @@ -213,12 +233,13 @@ 5.45 } 5.46 5.47 protected void generatePackageList() throws IOException { 5.48 - tableIndexSummary(); 5.49 - tableHeaderStart("#CCCCFF"); 5.50 + tableIndexSummary(useTableSummary); 5.51 + tableCaptionStart(); 5.52 printText("doclet.ClassUse_Packages.that.use.0", 5.53 getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc, 5.54 false))); 5.55 - tableHeaderEnd(); 5.56 + tableCaptionEnd(); 5.57 + summaryTableHeader(packageTableHeader, "col"); 5.58 5.59 for (Iterator<PackageDoc> it = pkgSet.iterator(); it.hasNext();) { 5.60 PackageDoc pkg = it.next(); 5.61 @@ -234,12 +255,13 @@ 5.62 pkgToPackageAnnotations == null || 5.63 pkgToPackageAnnotations.size() == 0) 5.64 return; 5.65 - tableIndexSummary(); 5.66 - tableHeaderStart("#CCCCFF"); 5.67 + tableIndexSummary(useTableSummary); 5.68 + tableCaptionStart(); 5.69 printText("doclet.ClassUse_PackageAnnotation", 5.70 getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc, 5.71 false))); 5.72 - tableHeaderEnd(); 5.73 + tableCaptionEnd(); 5.74 + summaryTableHeader(packageTableHeader, "col"); 5.75 for (Iterator<PackageDoc> it = pkgToPackageAnnotations.iterator(); it.hasNext();) { 5.76 PackageDoc pkg = it.next(); 5.77 trBgcolorStyle("white", "TableRowColor"); 5.78 @@ -300,83 +322,68 @@ 5.79 LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc, false)); 5.80 String pkgLink = getPackageLink(pkg, Util.getPackageName(pkg), false); 5.81 classSubWriter.printUseInfo(pkgToClassAnnotations.get(pkg.name()), 5.82 - configuration.getText("doclet.ClassUse_Annotation", classLink, 5.83 - pkgLink)); 5.84 - 5.85 + configuration.getText("doclet.ClassUse_Annotation", classLink, 5.86 + pkgLink), classUseTableSummary); 5.87 classSubWriter.printUseInfo(pkgToClassTypeParameter.get(pkg.name()), 5.88 - configuration.getText("doclet.ClassUse_TypeParameter", classLink, 5.89 - pkgLink)); 5.90 + configuration.getText("doclet.ClassUse_TypeParameter", classLink, 5.91 + pkgLink), classUseTableSummary); 5.92 classSubWriter.printUseInfo(pkgToSubclass.get(pkg.name()), 5.93 - configuration.getText("doclet.ClassUse_Subclass", classLink, 5.94 - pkgLink)); 5.95 + configuration.getText("doclet.ClassUse_Subclass", classLink, 5.96 + pkgLink), subclassUseTableSummary); 5.97 classSubWriter.printUseInfo(pkgToSubinterface.get(pkg.name()), 5.98 - configuration.getText("doclet.ClassUse_Subinterface", 5.99 - classLink, 5.100 - pkgLink)); 5.101 + configuration.getText("doclet.ClassUse_Subinterface", classLink, 5.102 + pkgLink), subinterfaceUseTableSummary); 5.103 classSubWriter.printUseInfo(pkgToImplementingClass.get(pkg.name()), 5.104 - configuration.getText("doclet.ClassUse_ImplementingClass", 5.105 - classLink, 5.106 - pkgLink)); 5.107 + configuration.getText("doclet.ClassUse_ImplementingClass", classLink, 5.108 + pkgLink), classUseTableSummary); 5.109 fieldSubWriter.printUseInfo(pkgToField.get(pkg.name()), 5.110 - configuration.getText("doclet.ClassUse_Field", 5.111 - classLink, 5.112 - pkgLink)); 5.113 + configuration.getText("doclet.ClassUse_Field", classLink, 5.114 + pkgLink), fieldUseTableSummary); 5.115 fieldSubWriter.printUseInfo(pkgToFieldAnnotations.get(pkg.name()), 5.116 - configuration.getText("doclet.ClassUse_FieldAnnotations", 5.117 - classLink, 5.118 - pkgLink)); 5.119 + configuration.getText("doclet.ClassUse_FieldAnnotations", classLink, 5.120 + pkgLink), fieldUseTableSummary); 5.121 fieldSubWriter.printUseInfo(pkgToFieldTypeParameter.get(pkg.name()), 5.122 - configuration.getText("doclet.ClassUse_FieldTypeParameter", 5.123 - classLink, 5.124 - pkgLink)); 5.125 + configuration.getText("doclet.ClassUse_FieldTypeParameter", classLink, 5.126 + pkgLink), fieldUseTableSummary); 5.127 methodSubWriter.printUseInfo(pkgToMethodAnnotations.get(pkg.name()), 5.128 - configuration.getText("doclet.ClassUse_MethodAnnotations", classLink, 5.129 - pkgLink)); 5.130 + configuration.getText("doclet.ClassUse_MethodAnnotations", classLink, 5.131 + pkgLink), methodUseTableSummary); 5.132 methodSubWriter.printUseInfo(pkgToMethodParameterAnnotations.get(pkg.name()), 5.133 - configuration.getText("doclet.ClassUse_MethodParameterAnnotations", classLink, 5.134 - pkgLink)); 5.135 + configuration.getText("doclet.ClassUse_MethodParameterAnnotations", classLink, 5.136 + pkgLink), methodUseTableSummary); 5.137 methodSubWriter.printUseInfo(pkgToMethodTypeParameter.get(pkg.name()), 5.138 - configuration.getText("doclet.ClassUse_MethodTypeParameter", classLink, 5.139 - pkgLink)); 5.140 + configuration.getText("doclet.ClassUse_MethodTypeParameter", classLink, 5.141 + pkgLink), methodUseTableSummary); 5.142 methodSubWriter.printUseInfo(pkgToMethodReturn.get(pkg.name()), 5.143 - configuration.getText("doclet.ClassUse_MethodReturn", 5.144 - classLink, 5.145 - pkgLink)); 5.146 + configuration.getText("doclet.ClassUse_MethodReturn", classLink, 5.147 + pkgLink), methodUseTableSummary); 5.148 methodSubWriter.printUseInfo(pkgToMethodReturnTypeParameter.get(pkg.name()), 5.149 - configuration.getText("doclet.ClassUse_MethodReturnTypeParameter", classLink, 5.150 - pkgLink)); 5.151 + configuration.getText("doclet.ClassUse_MethodReturnTypeParameter", classLink, 5.152 + pkgLink), methodUseTableSummary); 5.153 methodSubWriter.printUseInfo(pkgToMethodArgs.get(pkg.name()), 5.154 - configuration.getText("doclet.ClassUse_MethodArgs", 5.155 - classLink, 5.156 - pkgLink)); 5.157 + configuration.getText("doclet.ClassUse_MethodArgs", classLink, 5.158 + pkgLink), methodUseTableSummary); 5.159 methodSubWriter.printUseInfo(pkgToMethodArgTypeParameter.get(pkg.name()), 5.160 - configuration.getText("doclet.ClassUse_MethodArgsTypeParameters", 5.161 - classLink, 5.162 - pkgLink)); 5.163 + configuration.getText("doclet.ClassUse_MethodArgsTypeParameters", classLink, 5.164 + pkgLink), methodUseTableSummary); 5.165 methodSubWriter.printUseInfo(pkgToMethodThrows.get(pkg.name()), 5.166 - configuration.getText("doclet.ClassUse_MethodThrows", 5.167 - classLink, 5.168 - pkgLink)); 5.169 + configuration.getText("doclet.ClassUse_MethodThrows", classLink, 5.170 + pkgLink), methodUseTableSummary); 5.171 constrSubWriter.printUseInfo(pkgToConstructorAnnotations.get(pkg.name()), 5.172 - configuration.getText("doclet.ClassUse_ConstructorAnnotations", 5.173 - classLink, 5.174 - pkgLink)); 5.175 + configuration.getText("doclet.ClassUse_ConstructorAnnotations", classLink, 5.176 + pkgLink), constructorUseTableSummary); 5.177 constrSubWriter.printUseInfo(pkgToConstructorParameterAnnotations.get(pkg.name()), 5.178 - configuration.getText("doclet.ClassUse_ConstructorParameterAnnotations", 5.179 - classLink, 5.180 - pkgLink)); 5.181 + configuration.getText("doclet.ClassUse_ConstructorParameterAnnotations", classLink, 5.182 + pkgLink), constructorUseTableSummary); 5.183 constrSubWriter.printUseInfo(pkgToConstructorArgs.get(pkg.name()), 5.184 - configuration.getText("doclet.ClassUse_ConstructorArgs", 5.185 - classLink, 5.186 - pkgLink)); 5.187 + configuration.getText("doclet.ClassUse_ConstructorArgs", classLink, 5.188 + pkgLink), constructorUseTableSummary); 5.189 constrSubWriter.printUseInfo(pkgToConstructorArgTypeParameter.get(pkg.name()), 5.190 - configuration.getText("doclet.ClassUse_ConstructorArgsTypeParameters", 5.191 - classLink, 5.192 - pkgLink)); 5.193 + configuration.getText("doclet.ClassUse_ConstructorArgsTypeParameters", classLink, 5.194 + pkgLink), constructorUseTableSummary); 5.195 constrSubWriter.printUseInfo(pkgToConstructorThrows.get(pkg.name()), 5.196 - configuration.getText("doclet.ClassUse_ConstructorThrows", 5.197 - classLink, 5.198 - pkgLink)); 5.199 + configuration.getText("doclet.ClassUse_ConstructorThrows", classLink, 5.200 + pkgLink), constructorUseTableSummary); 5.201 } 5.202 5.203 /**
6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Fri Mar 27 14:11:53 2009 -0700 6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Tue Mar 31 08:54:12 2009 -0700 6.3 @@ -35,6 +35,7 @@ 6.4 * Write the Constants Summary Page in HTML format. 6.5 * 6.6 * @author Jamie Ho 6.7 + * @author Bhavesh Patel (Modified) 6.8 * @since 1.4 6.9 */ 6.10 public class ConstantsSummaryWriterImpl extends HtmlDocletWriter 6.11 @@ -50,6 +51,10 @@ 6.12 */ 6.13 private ClassDoc currentClassDoc; 6.14 6.15 + private final String constantsTableSummary; 6.16 + 6.17 + private final String[] constantsTableHeader; 6.18 + 6.19 /** 6.20 * Construct a ConstantsSummaryWriter. 6.21 * @param configuration the configuration used in this run 6.22 @@ -59,6 +64,13 @@ 6.23 throws IOException { 6.24 super(configuration, ConfigurationImpl.CONSTANTS_FILE_NAME); 6.25 this.configuration = configuration; 6.26 + constantsTableSummary = configuration.getText("doclet.Constants_Table_Summary", 6.27 + configuration.getText("doclet.Constants_Summary")); 6.28 + constantsTableHeader = new String[] { 6.29 + getModifierTypeHeader(), 6.30 + configuration.getText("doclet.ConstantField"), 6.31 + configuration.getText("doclet.Value") 6.32 + }; 6.33 } 6.34 6.35 /** 6.36 @@ -151,12 +163,11 @@ 6.37 * @param classStr the heading to print. 6.38 */ 6.39 protected void writeClassName(String classStr) { 6.40 - table(1, 3, 0); 6.41 - trBgcolorStyle("#EEEEFF", "TableSubHeadingColor"); 6.42 - thAlignColspan("left", 3); 6.43 + table(1, 3, 0, constantsTableSummary); 6.44 + tableSubCaptionStart(); 6.45 write(classStr); 6.46 - thEnd(); 6.47 - trEnd(); 6.48 + tableCaptionEnd(); 6.49 + summaryTableHeader(constantsTableHeader, "col"); 6.50 } 6.51 6.52 private void tableFooter(boolean isHeader) {
7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Fri Mar 27 14:11:53 2009 -0700 7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Tue Mar 31 08:54:12 2009 -0700 7.3 @@ -37,6 +37,7 @@ 7.4 * 7.5 * @author Robert Field 7.6 * @author Atul M Dambalkar 7.7 + * @author Bhavesh Patel (Modified) 7.8 */ 7.9 public class ConstructorWriterImpl extends AbstractExecutableMemberWriter 7.10 implements ConstructorWriter, MemberSummaryWriter { 7.11 @@ -211,8 +212,34 @@ 7.12 this.foundNonPubConstructor = foundNonPubConstructor; 7.13 } 7.14 7.15 - public void printSummaryLabel(ClassDoc cd) { 7.16 - writer.strongText("doclet.Constructor_Summary"); 7.17 + public void printSummaryLabel() { 7.18 + writer.printText("doclet.Constructor_Summary"); 7.19 + } 7.20 + 7.21 + public void printTableSummary() { 7.22 + writer.tableIndexSummary(configuration().getText("doclet.Member_Table_Summary", 7.23 + configuration().getText("doclet.Constructor_Summary"), 7.24 + configuration().getText("doclet.constructors"))); 7.25 + } 7.26 + 7.27 + public void printSummaryTableHeader(ProgramElementDoc member) { 7.28 + String[] header; 7.29 + if (foundNonPubConstructor) { 7.30 + header = new String[] { 7.31 + configuration().getText("doclet.Modifier"), 7.32 + configuration().getText("doclet.0_and_1", 7.33 + configuration().getText("doclet.Constructor"), 7.34 + configuration().getText("doclet.Description")) 7.35 + }; 7.36 + } 7.37 + else { 7.38 + header = new String[] { 7.39 + configuration().getText("doclet.0_and_1", 7.40 + configuration().getText("doclet.Constructor"), 7.41 + configuration().getText("doclet.Description")) 7.42 + }; 7.43 + } 7.44 + writer.summaryTableHeader(header, "col"); 7.45 } 7.46 7.47 public void printSummaryAnchor(ClassDoc cd) {
8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Fri Mar 27 14:11:53 2009 -0700 8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Tue Mar 31 08:54:12 2009 -0700 8.3 @@ -35,6 +35,7 @@ 8.4 * 8.5 * @see java.util.List 8.6 * @author Atul M Dambalkar 8.7 + * @author Bhavesh Patel (Modified) 8.8 */ 8.9 public class DeprecatedListWriter extends SubWriterHolderWriter { 8.10 8.11 @@ -55,6 +56,28 @@ 8.12 "doclet.Deprecated_Annotation_Type_Members" 8.13 }; 8.14 8.15 + private static final String[] SUMMARY_KEYS = new String[] { 8.16 + "doclet.deprecated_interfaces", "doclet.deprecated_classes", 8.17 + "doclet.deprecated_enums", "doclet.deprecated_exceptions", 8.18 + "doclet.deprecated_errors", 8.19 + "doclet.deprecated_annotation_types", 8.20 + "doclet.deprecated_fields", 8.21 + "doclet.deprecated_methods", "doclet.deprecated_constructors", 8.22 + "doclet.deprecated_enum_constants", 8.23 + "doclet.deprecated_annotation_type_members" 8.24 + }; 8.25 + 8.26 + private static final String[] HEADER_KEYS = new String[] { 8.27 + "doclet.Interface", "doclet.Class", 8.28 + "doclet.Enum", "doclet.Exceptions", 8.29 + "doclet.Errors", 8.30 + "doclet.AnnotationType", 8.31 + "doclet.Field", 8.32 + "doclet.Method", "doclet.Constructor", 8.33 + "doclet.Enum_Constant", 8.34 + "doclet.Annotation_Type_Member" 8.35 + }; 8.36 + 8.37 private AbstractMemberWriter[] writers; 8.38 8.39 private ConfigurationImpl configuration; 8.40 @@ -119,11 +142,20 @@ 8.41 ulEnd(); 8.42 println(); 8.43 8.44 + String memberTableSummary; 8.45 + String[] memberTableHeader = new String[1]; 8.46 for (int i = 0; i < DeprecatedAPIListBuilder.NUM_TYPES; i++) { 8.47 if (deprapi.hasDocumentation(i)) { 8.48 writeAnchor(deprapi, i); 8.49 + memberTableSummary = 8.50 + configuration.getText("doclet.Member_Table_Summary", 8.51 + configuration.getText(HEADING_KEYS[i]), 8.52 + configuration.getText(SUMMARY_KEYS[i])); 8.53 + memberTableHeader[0] = configuration.getText("doclet.0_and_1", 8.54 + configuration.getText(HEADER_KEYS[i]), 8.55 + configuration.getText("doclet.Description")); 8.56 writers[i].printDeprecatedAPI(deprapi.getList(i), 8.57 - HEADING_KEYS[i]); 8.58 + HEADING_KEYS[i], memberTableSummary, memberTableHeader); 8.59 } 8.60 } 8.61 printDeprecatedFooter();
9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Fri Mar 27 14:11:53 2009 -0700 9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Tue Mar 31 08:54:12 2009 -0700 9.3 @@ -35,6 +35,7 @@ 9.4 * Writes enum constant documentation in HTML format. 9.5 * 9.6 * @author Jamie Ho 9.7 + * @author Bhavesh Patel (Modified) 9.8 */ 9.9 public class EnumConstantWriterImpl extends AbstractMemberWriter 9.10 implements EnumConstantWriter, MemberSummaryWriter { 9.11 @@ -194,8 +195,23 @@ 9.12 return VisibleMemberMap.ENUM_CONSTANTS; 9.13 } 9.14 9.15 - public void printSummaryLabel(ClassDoc cd) { 9.16 - writer.strongText("doclet.Enum_Constant_Summary"); 9.17 + public void printSummaryLabel() { 9.18 + writer.printText("doclet.Enum_Constant_Summary"); 9.19 + } 9.20 + 9.21 + public void printTableSummary() { 9.22 + writer.tableIndexSummary(configuration().getText("doclet.Member_Table_Summary", 9.23 + configuration().getText("doclet.Enum_Constant_Summary"), 9.24 + configuration().getText("doclet.enum_constants"))); 9.25 + } 9.26 + 9.27 + public void printSummaryTableHeader(ProgramElementDoc member) { 9.28 + String[] header = new String[] { 9.29 + configuration().getText("doclet.0_and_1", 9.30 + configuration().getText("doclet.Enum_Constant"), 9.31 + configuration().getText("doclet.Description")) 9.32 + }; 9.33 + writer.summaryTableHeader(header, "col"); 9.34 } 9.35 9.36 public void printSummaryAnchor(ClassDoc cd) {
10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Fri Mar 27 14:11:53 2009 -0700 10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Tue Mar 31 08:54:12 2009 -0700 10.3 @@ -37,6 +37,7 @@ 10.4 * @author Robert Field 10.5 * @author Atul M Dambalkar 10.6 * @author Jamie Ho (rewrite) 10.7 + * @author Bhavesh Patel (Modified) 10.8 */ 10.9 public class FieldWriterImpl extends AbstractMemberWriter 10.10 implements FieldWriter, MemberSummaryWriter { 10.11 @@ -236,8 +237,24 @@ 10.12 return VisibleMemberMap.FIELDS; 10.13 } 10.14 10.15 - public void printSummaryLabel(ClassDoc cd) { 10.16 - writer.strongText("doclet.Field_Summary"); 10.17 + public void printSummaryLabel() { 10.18 + writer.printText("doclet.Field_Summary"); 10.19 + } 10.20 + 10.21 + public void printTableSummary() { 10.22 + writer.tableIndexSummary(configuration().getText("doclet.Member_Table_Summary", 10.23 + configuration().getText("doclet.Field_Summary"), 10.24 + configuration().getText("doclet.fields"))); 10.25 + } 10.26 + 10.27 + public void printSummaryTableHeader(ProgramElementDoc member) { 10.28 + String[] header = new String[] { 10.29 + writer.getModifierTypeHeader(), 10.30 + configuration().getText("doclet.0_and_1", 10.31 + configuration().getText("doclet.Field"), 10.32 + configuration().getText("doclet.Description")) 10.33 + }; 10.34 + writer.summaryTableHeader(header, "col"); 10.35 } 10.36 10.37 public void printSummaryAnchor(ClassDoc cd) {
11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Mar 27 14:11:53 2009 -0700 11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue Mar 31 08:54:12 2009 -0700 11.3 @@ -236,17 +236,19 @@ 11.4 configuration.tagletManager.getCustomTags(doc), 11.5 getTagletWriterInstance(false), output); 11.6 String outputString = output.toString().trim(); 11.7 - // For RootDoc and ClassDoc, this section is not the definition description 11.8 - // but the start of definition list. 11.9 + // For RootDoc, ClassDoc and PackageDoc, this section is not the 11.10 + // definition description but the start of definition list. 11.11 if (!outputString.isEmpty()) { 11.12 - if (!(doc instanceof RootDoc || doc instanceof ClassDoc)) { 11.13 + if (!(doc instanceof RootDoc || doc instanceof ClassDoc || 11.14 + doc instanceof PackageDoc)) { 11.15 printMemberDetailsListStartTag(); 11.16 dd(); 11.17 } 11.18 printTagsInfoHeader(); 11.19 print(outputString); 11.20 printTagsInfoFooter(); 11.21 - if (!(doc instanceof RootDoc || doc instanceof ClassDoc)) 11.22 + if (!(doc instanceof RootDoc || doc instanceof ClassDoc || 11.23 + doc instanceof PackageDoc)) 11.24 ddEnd(); 11.25 } 11.26 } 11.27 @@ -785,6 +787,15 @@ 11.28 } 11.29 11.30 /** 11.31 + * Print the Html table tag for the index summary tables. 11.32 + * 11.33 + * @param summary the summary for the table tag summary attribute. 11.34 + */ 11.35 + public void tableIndexSummary(String summary) { 11.36 + table(1, "100%", 3, 0, summary); 11.37 + } 11.38 + 11.39 + /** 11.40 * Same as {@link #tableIndexSummary()}. 11.41 */ 11.42 public void tableIndexDetail() { 11.43 @@ -800,6 +811,40 @@ 11.44 } 11.45 11.46 /** 11.47 + * Print table caption. 11.48 + */ 11.49 + public void tableCaptionStart() { 11.50 + captionStyle("TableCaption"); 11.51 + } 11.52 + 11.53 + /** 11.54 + * Print table sub-caption. 11.55 + */ 11.56 + public void tableSubCaptionStart() { 11.57 + captionStyle("TableSubCaption"); 11.58 + } 11.59 + 11.60 + /** 11.61 + * Print table caption end tags. 11.62 + */ 11.63 + public void tableCaptionEnd() { 11.64 + captionEnd(); 11.65 + } 11.66 + 11.67 + /** 11.68 + * Print summary table header. 11.69 + */ 11.70 + public void summaryTableHeader(String[] header, String scope) { 11.71 + tr(); 11.72 + for ( int i=0; i < header.length; i++ ) { 11.73 + thScopeNoWrap("TableHeader", scope); 11.74 + print(header[i]); 11.75 + thEnd(); 11.76 + } 11.77 + trEnd(); 11.78 + } 11.79 + 11.80 + /** 11.81 * Prine table header information about color, column span and the font. 11.82 * 11.83 * @param color Background color.
12.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Fri Mar 27 14:11:53 2009 -0700 12.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Tue Mar 31 08:54:12 2009 -0700 12.3 @@ -38,6 +38,7 @@ 12.4 * @author Robert Field 12.5 * @author Atul M Dambalkar 12.6 * @author Jamie Ho (rewrite) 12.7 + * @author Bhavesh Patel (Modified) 12.8 */ 12.9 public class MethodWriterImpl extends AbstractExecutableMemberWriter 12.10 implements MethodWriter, MemberSummaryWriter { 12.11 @@ -255,8 +256,24 @@ 12.12 return VisibleMemberMap.METHODS; 12.13 } 12.14 12.15 - public void printSummaryLabel(ClassDoc cd) { 12.16 - writer.strongText("doclet.Method_Summary"); 12.17 + public void printSummaryLabel() { 12.18 + writer.printText("doclet.Method_Summary"); 12.19 + } 12.20 + 12.21 + public void printTableSummary() { 12.22 + writer.tableIndexSummary(configuration().getText("doclet.Member_Table_Summary", 12.23 + configuration().getText("doclet.Method_Summary"), 12.24 + configuration().getText("doclet.methods"))); 12.25 + } 12.26 + 12.27 + public void printSummaryTableHeader(ProgramElementDoc member) { 12.28 + String[] header = new String[] { 12.29 + writer.getModifierTypeHeader(), 12.30 + configuration().getText("doclet.0_and_1", 12.31 + configuration().getText("doclet.Method"), 12.32 + configuration().getText("doclet.Description")) 12.33 + }; 12.34 + writer.summaryTableHeader(header, "col"); 12.35 } 12.36 12.37 public void printSummaryAnchor(ClassDoc cd) {
13.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Fri Mar 27 14:11:53 2009 -0700 13.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Tue Mar 31 08:54:12 2009 -0700 13.3 @@ -37,6 +37,7 @@ 13.4 * @author Robert Field 13.5 * @author Atul M Dambalkar 13.6 * @author Jamie Ho (rewrite) 13.7 + * @author Bhavesh Patel (Modified) 13.8 */ 13.9 public class NestedClassWriterImpl extends AbstractMemberWriter 13.10 implements MemberSummaryWriter { 13.11 @@ -147,8 +148,35 @@ 13.12 return VisibleMemberMap.INNERCLASSES; 13.13 } 13.14 13.15 - public void printSummaryLabel(ClassDoc cd) { 13.16 - writer.strongText("doclet.Nested_Class_Summary"); 13.17 + public void printSummaryLabel() { 13.18 + writer.printText("doclet.Nested_Class_Summary"); 13.19 + } 13.20 + 13.21 + public void printTableSummary() { 13.22 + writer.tableIndexSummary(configuration().getText("doclet.Member_Table_Summary", 13.23 + configuration().getText("doclet.Nested_Class_Summary"), 13.24 + configuration().getText("doclet.nested_classes"))); 13.25 + } 13.26 + 13.27 + public void printSummaryTableHeader(ProgramElementDoc member) { 13.28 + String[] header; 13.29 + if (member.isInterface()) { 13.30 + header = new String[] { 13.31 + writer.getModifierTypeHeader(), 13.32 + configuration().getText("doclet.0_and_1", 13.33 + configuration().getText("doclet.Interface"), 13.34 + configuration().getText("doclet.Description")) 13.35 + }; 13.36 + } 13.37 + else { 13.38 + header = new String[] { 13.39 + writer.getModifierTypeHeader(), 13.40 + configuration().getText("doclet.0_and_1", 13.41 + configuration().getText("doclet.Class"), 13.42 + configuration().getText("doclet.Description")) 13.43 + }; 13.44 + } 13.45 + writer.summaryTableHeader(header, "col"); 13.46 } 13.47 13.48 public void printSummaryAnchor(ClassDoc cd) {
14.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Fri Mar 27 14:11:53 2009 -0700 14.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Tue Mar 31 08:54:12 2009 -0700 14.3 @@ -114,7 +114,7 @@ 14.4 * 14.5 * @param text Text string will not be used in this method. 14.6 */ 14.7 - protected void printIndexHeader(String text) { 14.8 + protected void printIndexHeader(String text, String tableSummary) { 14.9 printTableHeader(false); 14.10 } 14.11
15.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Fri Mar 27 14:11:53 2009 -0700 15.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Tue Mar 31 08:54:12 2009 -0700 15.3 @@ -36,6 +36,7 @@ 15.4 * with the "pacakge-summary.html" file for the clicked package. 15.5 * 15.6 * @author Atul M Dambalkar 15.7 + * @author Bhavesh Patel (Modified) 15.8 */ 15.9 public class PackageIndexWriter extends AbstractPackageIndexWriter { 15.10 15.11 @@ -123,7 +124,10 @@ 15.12 List<PackageDoc> list = groupPackageMap.get(groupname); 15.13 if (list != null && list.size() > 0) { 15.14 printIndexContents(list.toArray(new PackageDoc[list.size()]), 15.15 - groupname); 15.16 + groupname, 15.17 + configuration.getText("doclet.Member_Table_Summary", 15.18 + groupname, 15.19 + configuration.getText("doclet.packages"))); 15.20 } 15.21 } 15.22 } 15.23 @@ -149,11 +153,12 @@ 15.24 /** 15.25 * Print Html tags for the table for this package index. 15.26 */ 15.27 - protected void printIndexHeader(String text) { 15.28 - tableIndexSummary(); 15.29 - tableHeaderStart("#CCCCFF"); 15.30 - strong(text); 15.31 - tableHeaderEnd(); 15.32 + protected void printIndexHeader(String text, String tableSummary) { 15.33 + tableIndexSummary(tableSummary); 15.34 + tableCaptionStart(); 15.35 + print(text); 15.36 + tableCaptionEnd(); 15.37 + summaryTableHeader(packageTableHeader, "col"); 15.38 } 15.39 15.40 /**
16.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Fri Mar 27 14:11:53 2009 -0700 16.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Tue Mar 31 08:54:12 2009 -0700 16.3 @@ -34,6 +34,7 @@ 16.4 * Generate package usage information. 16.5 * 16.6 * @author Robert G. Field 16.7 + * @author Bhavesh Patel (Modified) 16.8 */ 16.9 public class PackageUseWriter extends SubWriterHolderWriter { 16.10 16.11 @@ -131,11 +132,12 @@ 16.12 } 16.13 16.14 protected void generatePackageList() throws IOException { 16.15 - tableIndexSummary(); 16.16 - tableHeaderStart("#CCCCFF"); 16.17 + tableIndexSummary(useTableSummary); 16.18 + tableCaptionStart(); 16.19 printText("doclet.ClassUse_Packages.that.use.0", 16.20 getPackageLink(pkgdoc, Util.getPackageName(pkgdoc), false)); 16.21 - tableHeaderEnd(); 16.22 + tableCaptionEnd(); 16.23 + summaryTableHeader(packageTableHeader, "col"); 16.24 Iterator<String> it = usingPackageToUsedClasses.keySet().iterator(); 16.25 while (it.hasNext()) { 16.26 PackageDoc pkg = configuration.root.packageNamed(it.next()); 16.27 @@ -147,6 +149,11 @@ 16.28 } 16.29 16.30 protected void generateClassList() throws IOException { 16.31 + String[] classTableHeader = new String[] { 16.32 + configuration.getText("doclet.0_and_1", 16.33 + configuration.getText("doclet.Class"), 16.34 + configuration.getText("doclet.Description")) 16.35 + }; 16.36 Iterator<String> itp = usingPackageToUsedClasses.keySet().iterator(); 16.37 while (itp.hasNext()) { 16.38 String packageName = itp.next(); 16.39 @@ -154,12 +161,14 @@ 16.40 if (usingPackage != null) { 16.41 anchor(usingPackage.name()); 16.42 } 16.43 - tableIndexSummary(); 16.44 - tableHeaderStart("#CCCCFF"); 16.45 + tableIndexSummary(configuration.getText("doclet.Use_Table_Summary", 16.46 + configuration.getText("doclet.classes"))); 16.47 + tableCaptionStart(); 16.48 printText("doclet.ClassUse_Classes.in.0.used.by.1", 16.49 getPackageLink(pkgdoc, Util.getPackageName(pkgdoc), false), 16.50 getPackageLink(usingPackage,Util.getPackageName(usingPackage), false)); 16.51 - tableHeaderEnd(); 16.52 + tableCaptionEnd(); 16.53 + summaryTableHeader(classTableHeader, "col"); 16.54 Iterator<ClassDoc> itc = 16.55 usingPackageToUsedClasses.get(packageName).iterator(); 16.56 while (itc.hasNext()) {
17.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Fri Mar 27 14:11:53 2009 -0700 17.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Tue Mar 31 08:54:12 2009 -0700 17.3 @@ -38,6 +38,7 @@ 17.4 * class-kind will update the frame with the clicked class-kind page. 17.5 * 17.6 * @author Atul M Dambalkar 17.7 + * @author Bhavesh Patel (Modified) 17.8 */ 17.9 public class PackageWriterImpl extends HtmlDocletWriter 17.10 implements PackageSummaryWriter { 17.11 @@ -107,14 +108,15 @@ 17.12 /** 17.13 * {@inheritDoc} 17.14 */ 17.15 - public void writeClassesSummary(ClassDoc[] classes, String label) { 17.16 + public void writeClassesSummary(ClassDoc[] classes, String label, String tableSummary, String[] tableHeader) { 17.17 if(classes.length > 0) { 17.18 Arrays.sort(classes); 17.19 - tableIndexSummary(); 17.20 + tableIndexSummary(tableSummary); 17.21 boolean printedHeading = false; 17.22 for (int i = 0; i < classes.length; i++) { 17.23 if (!printedHeading) { 17.24 - printFirstRow(label); 17.25 + printTableCaption(label); 17.26 + printFirstRow(tableHeader); 17.27 printedHeading = true; 17.28 } 17.29 if (!Util.isCoreClass(classes[i]) || 17.30 @@ -149,14 +151,23 @@ 17.31 } 17.32 17.33 /** 17.34 + * Print the table caption for the class-listing. 17.35 + * 17.36 + * @param label label for the Class kind listing. 17.37 + */ 17.38 + protected void printTableCaption(String label) { 17.39 + tableCaptionStart(); 17.40 + print(label); 17.41 + tableCaptionEnd(); 17.42 + } 17.43 + 17.44 + /** 17.45 * Print the table heading for the class-listing. 17.46 * 17.47 - * @param label Label for the Class kind listing. 17.48 + * @param tableHeader table header string for the Class listing. 17.49 */ 17.50 - protected void printFirstRow(String label) { 17.51 - tableHeaderStart("#CCCCFF"); 17.52 - strong(label); 17.53 - tableHeaderEnd(); 17.54 + protected void printFirstRow(String[] tableHeader) { 17.55 + summaryTableHeader(tableHeader, "col"); 17.56 } 17.57 17.58 /**
18.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/StylesheetWriter.java Fri Mar 27 14:11:53 2009 -0700 18.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/StylesheetWriter.java Tue Mar 31 08:54:12 2009 -0700 18.3 @@ -33,6 +33,7 @@ 18.4 * Writes the style sheet for the doclet output. 18.5 * 18.6 * @author Atul M Dambalkar 18.7 + * @author Bhavesh Patel (Modified) 18.8 */ 18.9 public class StylesheetWriter extends HtmlDocletWriter { 18.10 18.11 @@ -115,6 +116,13 @@ 18.12 println("background-color:#FFFFFF; color:#000000}"); 18.13 print(".NavBarCell3 { font-family: Arial, Helvetica, sans-serif; "); 18.14 println("background-color:#FFFFFF; color:#000000}"); 18.15 + 18.16 + print("/* "); printText("doclet.Style_line_12"); println(" */"); 18.17 + print(".TableCaption { background: #CCCCFF; color:#000000; text-align: left; font-size: 150%; font-weight: bold; border-left: 2px ridge; border-right: 2px ridge; border-top: 2px ridge; padding-left: 5px; }"); 18.18 + print(" /* "); printText("doclet.Style_line_5"); println(" */"); 18.19 + print(".TableSubCaption { background: #EEEEFF; color:#000000; text-align: left; font-weight: bold; border-left: 2px ridge; border-right: 2px ridge; border-top: 2px ridge; padding-left: 5px; }"); 18.20 + print(" /* "); printText("doclet.Style_line_6"); println(" */"); 18.21 + print(".TableHeader { text-align: center; font-size: 80%; font-weight: bold; }"); 18.22 println(""); 18.23 18.24 }
19.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Fri Mar 27 14:11:53 2009 -0700 19.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Tue Mar 31 08:54:12 2009 -0700 19.3 @@ -43,6 +43,7 @@ 19.4 * 19.5 * @author Robert Field 19.6 * @author Atul M Dambalkar 19.7 + * @author Bhavesh Patel (Modified) 19.8 */ 19.9 public abstract class SubWriterHolderWriter extends HtmlDocletWriter { 19.10 19.11 @@ -72,10 +73,11 @@ 19.12 19.13 public void printSummaryHeader(AbstractMemberWriter mw, ClassDoc cd) { 19.14 mw.printSummaryAnchor(cd); 19.15 - tableIndexSummary(); 19.16 - tableHeaderStart("#CCCCFF"); 19.17 - mw.printSummaryLabel(cd); 19.18 - tableHeaderEnd(); 19.19 + mw.printTableSummary(); 19.20 + tableCaptionStart(); 19.21 + mw.printSummaryLabel(); 19.22 + tableCaptionEnd(); 19.23 + mw.printSummaryTableHeader(cd); 19.24 } 19.25 19.26 public void printTableHeadingBackground(String str) {
20.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Fri Mar 27 14:11:53 2009 -0700 20.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Tue Mar 31 08:54:12 2009 -0700 20.3 @@ -37,6 +37,7 @@ 20.4 * 20.5 * @since 1.2 20.6 * @author Atul M Dambalkar 20.7 + * @author Bhavesh Patel (Modified) 20.8 */ 20.9 public class HtmlWriter extends PrintWriter { 20.10 20.11 @@ -67,6 +68,21 @@ 20.12 protected boolean memberDetailsListPrinted; 20.13 20.14 /** 20.15 + * Header for tables displaying packages and description.. 20.16 + */ 20.17 + protected final String[] packageTableHeader; 20.18 + 20.19 + /** 20.20 + * Summary for use tables displaying class and package use. 20.21 + */ 20.22 + protected final String useTableSummary; 20.23 + 20.24 + /** 20.25 + * Column header for class docs displaying Modifier and Type header. 20.26 + */ 20.27 + protected final String modifierTypeHeader; 20.28 + 20.29 + /** 20.30 * Constructor. 20.31 * 20.32 * @param path The directory path to be created for this file 20.33 @@ -86,6 +102,15 @@ 20.34 this.configuration = configuration; 20.35 htmlFilename = filename; 20.36 this.memberDetailsListPrinted = false; 20.37 + packageTableHeader = new String[] { 20.38 + configuration.getText("doclet.Package"), 20.39 + configuration.getText("doclet.Description") 20.40 + }; 20.41 + useTableSummary = configuration.getText("doclet.Use_Table_Summary", 20.42 + configuration.getText("doclet.packages")); 20.43 + modifierTypeHeader = configuration.getText("doclet.0_and_1", 20.44 + configuration.getText("doclet.Modifier"), 20.45 + configuration.getText("doclet.Type")); 20.46 } 20.47 20.48 /** 20.49 @@ -803,6 +828,26 @@ 20.50 } 20.51 20.52 /** 20.53 + * Print HTML <TABLE BORDER="border" WIDTH="width" 20.54 + * CELLPADDING="cellpadding" CELLSPACING="cellspacing" SUMMARY="summary"> tag. 20.55 + * 20.56 + * @param border Border size. 20.57 + * @param width Width of the table. 20.58 + * @param cellpadding Cellpadding for the table cells. 20.59 + * @param cellspacing Cellspacing for the table cells. 20.60 + * @param summary Table summary. 20.61 + */ 20.62 + public void table(int border, String width, int cellpadding, 20.63 + int cellspacing, String summary) { 20.64 + println(DocletConstants.NL + 20.65 + "<TABLE BORDER=\"" + border + 20.66 + "\" WIDTH=\"" + width + 20.67 + "\" CELLPADDING=\"" + cellpadding + 20.68 + "\" CELLSPACING=\"" + cellspacing + 20.69 + "\" SUMMARY=\"" + summary + "\">"); 20.70 + } 20.71 + 20.72 + /** 20.73 * Print HTML <TABLE BORDER="border" CELLPADDING="cellpadding" 20.74 * CELLSPACING="cellspacing"> tag. 20.75 * 20.76 @@ -819,6 +864,23 @@ 20.77 } 20.78 20.79 /** 20.80 + * Print HTML <TABLE BORDER="border" CELLPADDING="cellpadding" 20.81 + * CELLSPACING="cellspacing" SUMMARY="summary"> tag. 20.82 + * 20.83 + * @param border Border size. 20.84 + * @param cellpadding Cellpadding for the table cells. 20.85 + * @param cellspacing Cellspacing for the table cells. 20.86 + * @param summary Table summary. 20.87 + */ 20.88 + public void table(int border, int cellpadding, int cellspacing, String summary) { 20.89 + println(DocletConstants.NL + 20.90 + "<TABLE BORDER=\"" + border + 20.91 + "\" CELLPADDING=\"" + cellpadding + 20.92 + "\" CELLSPACING=\"" + cellspacing + 20.93 + "\" SUMMARY=\"" + summary + "\">"); 20.94 + } 20.95 + 20.96 + /** 20.97 * Print HTML <TABLE BORDER="border" WIDTH="width"> 20.98 * 20.99 * @param border Border size. 20.100 @@ -913,6 +975,23 @@ 20.101 } 20.102 20.103 /** 20.104 + * Print <CAPTION CLASS="stylename"> tag. Adds a newline character 20.105 + * at the end. 20.106 + * 20.107 + * @param stylename style to be applied. 20.108 + */ 20.109 + public void captionStyle(String stylename) { 20.110 + println("<CAPTION CLASS=\"" + stylename + "\">"); 20.111 + } 20.112 + 20.113 + /** 20.114 + * Print </CAPTION> tag. Add a newline character at the end. 20.115 + */ 20.116 + public void captionEnd() { 20.117 + println("</CAPTION>"); 20.118 + } 20.119 + 20.120 + /** 20.121 * Print <TR BGCOLOR="color" CLASS="stylename"> tag. Adds a newline character 20.122 * at the end. 20.123 * 20.124 @@ -953,6 +1032,23 @@ 20.125 } 20.126 20.127 /** 20.128 + * Print <TH CLASS="stylename" SCOPE="scope" NOWRAP> tag. 20.129 + * 20.130 + * @param stylename style to be applied. 20.131 + * @param scope the scope attribute. 20.132 + */ 20.133 + public void thScopeNoWrap(String stylename, String scope) { 20.134 + print("<TH CLASS=\"" + stylename + "\" SCOPE=\"" + scope + "\" NOWRAP>"); 20.135 + } 20.136 + 20.137 + /* 20.138 + * Returns a header for Modifier and Type column of a table. 20.139 + */ 20.140 + public String getModifierTypeHeader() { 20.141 + return modifierTypeHeader; 20.142 + } 20.143 + 20.144 + /** 20.145 * Print <TH align="align" COLSPAN=i> tag. 20.146 * 20.147 * @param align the align attribute.
21.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Fri Mar 27 14:11:53 2009 -0700 21.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Tue Mar 31 08:54:12 2009 -0700 21.3 @@ -83,6 +83,17 @@ 21.4 doclet.Deprecated_Methods=Deprecated Methods 21.5 doclet.Deprecated_Enum_Constants=Deprecated Enum Constants 21.6 doclet.Deprecated_Annotation_Type_Members=Deprecated Annotation Type Elements 21.7 +doclet.deprecated_classes=deprecated classes 21.8 +doclet.deprecated_enums=deprecated enums 21.9 +doclet.deprecated_interfaces=deprecated interfaces 21.10 +doclet.deprecated_exceptions=deprecated exceptions 21.11 +doclet.deprecated_annotation_types=deprecated annotation types 21.12 +doclet.deprecated_errors=deprecated errors 21.13 +doclet.deprecated_fields=deprecated fields 21.14 +doclet.deprecated_constructors=deprecated constructors 21.15 +doclet.deprecated_methods=deprecated methods 21.16 +doclet.deprecated_enum_constants=deprecated enum constants 21.17 +doclet.deprecated_annotation_type_members=deprecated annotation type elements 21.18 doclet.Frame_Output=Frame Output 21.19 doclet.Docs_generated_by_Javadoc=Documentation generated by Javadoc. 21.20 doclet.Generated_Docs_Untitled=Generated Documentation (Untitled) 21.21 @@ -171,6 +182,7 @@ 21.22 doclet.Style_line_9=Example of smaller, sans-serif font in frames 21.23 doclet.Style_line_10=Navigation bar fonts and colors 21.24 doclet.Style_line_11=Dark Blue 21.25 +doclet.Style_line_12=Table caption style 21.26 doclet.ClassUse_Packages.that.use.0=Packages that use {0} 21.27 doclet.ClassUse_Uses.of.0.in.1=Uses of {0} in {1} 21.28 doclet.ClassUse_Classes.in.0.used.by.1=Classes in {0} used by {1}
22.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java Fri Mar 27 14:11:53 2009 -0700 22.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java Tue Mar 31 08:54:12 2009 -0700 22.3 @@ -64,7 +64,7 @@ 22.4 * @param classes the array of classes to document. 22.5 * @param label the label for this table. 22.6 */ 22.7 - public abstract void writeClassesSummary(ClassDoc[] classes, String label); 22.8 + public abstract void writeClassesSummary(ClassDoc[] classes, String label, String tableSummary, String[] tableHeader); 22.9 22.10 /** 22.11 * Write the header for the summary.
23.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Fri Mar 27 14:11:53 2009 -0700 23.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Tue Mar 31 08:54:12 2009 -0700 23.3 @@ -40,6 +40,7 @@ 23.4 * Do not use it as an API 23.5 * 23.6 * @author Jamie Ho 23.7 + * @author Bhavesh Patel (Modified) 23.8 * @since 1.5 23.9 */ 23.10 public class PackageSummaryBuilder extends AbstractBuilder { 23.11 @@ -184,7 +185,15 @@ 23.12 * Build the summary for the classes in this package. 23.13 */ 23.14 public void buildClassSummary() { 23.15 - ClassDoc[] classes = 23.16 + String classTableSummary = 23.17 + configuration.getText("doclet.Member_Table_Summary", 23.18 + configuration.getText("doclet.Class_Summary"), 23.19 + configuration.getText("doclet.classes")); 23.20 + String[] classTableHeader = new String[] { 23.21 + configuration.getText("doclet.Class"), 23.22 + configuration.getText("doclet.Description") 23.23 + }; 23.24 + ClassDoc[] classes = 23.25 packageDoc.isIncluded() 23.26 ? packageDoc.ordinaryClasses() 23.27 : configuration.classDocCatalog.ordinaryClasses( 23.28 @@ -192,7 +201,8 @@ 23.29 if (classes.length > 0) { 23.30 packageWriter.writeClassesSummary( 23.31 classes, 23.32 - configuration.getText("doclet.Class_Summary")); 23.33 + configuration.getText("doclet.Class_Summary"), 23.34 + classTableSummary, classTableHeader); 23.35 } 23.36 } 23.37 23.38 @@ -200,7 +210,15 @@ 23.39 * Build the summary for the interfaces in this package. 23.40 */ 23.41 public void buildInterfaceSummary() { 23.42 - ClassDoc[] interfaces = 23.43 + String interfaceTableSummary = 23.44 + configuration.getText("doclet.Member_Table_Summary", 23.45 + configuration.getText("doclet.Interface_Summary"), 23.46 + configuration.getText("doclet.interfaces")); 23.47 + String[] interfaceTableHeader = new String[] { 23.48 + configuration.getText("doclet.Interface"), 23.49 + configuration.getText("doclet.Description") 23.50 + }; 23.51 + ClassDoc[] interfaces = 23.52 packageDoc.isIncluded() 23.53 ? packageDoc.interfaces() 23.54 : configuration.classDocCatalog.interfaces( 23.55 @@ -208,7 +226,8 @@ 23.56 if (interfaces.length > 0) { 23.57 packageWriter.writeClassesSummary( 23.58 interfaces, 23.59 - configuration.getText("doclet.Interface_Summary")); 23.60 + configuration.getText("doclet.Interface_Summary"), 23.61 + interfaceTableSummary, interfaceTableHeader); 23.62 } 23.63 } 23.64 23.65 @@ -216,7 +235,15 @@ 23.66 * Build the summary for the enums in this package. 23.67 */ 23.68 public void buildAnnotationTypeSummary() { 23.69 - ClassDoc[] annotationTypes = 23.70 + String annotationtypeTableSummary = 23.71 + configuration.getText("doclet.Member_Table_Summary", 23.72 + configuration.getText("doclet.Annotation_Types_Summary"), 23.73 + configuration.getText("doclet.annotationtypes")); 23.74 + String[] annotationtypeTableHeader = new String[] { 23.75 + configuration.getText("doclet.AnnotationType"), 23.76 + configuration.getText("doclet.Description") 23.77 + }; 23.78 + ClassDoc[] annotationTypes = 23.79 packageDoc.isIncluded() 23.80 ? packageDoc.annotationTypes() 23.81 : configuration.classDocCatalog.annotationTypes( 23.82 @@ -224,7 +251,8 @@ 23.83 if (annotationTypes.length > 0) { 23.84 packageWriter.writeClassesSummary( 23.85 annotationTypes, 23.86 - configuration.getText("doclet.Annotation_Types_Summary")); 23.87 + configuration.getText("doclet.Annotation_Types_Summary"), 23.88 + annotationtypeTableSummary, annotationtypeTableHeader); 23.89 } 23.90 } 23.91 23.92 @@ -232,7 +260,15 @@ 23.93 * Build the summary for the enums in this package. 23.94 */ 23.95 public void buildEnumSummary() { 23.96 - ClassDoc[] enums = 23.97 + String enumTableSummary = 23.98 + configuration.getText("doclet.Member_Table_Summary", 23.99 + configuration.getText("doclet.Enum_Summary"), 23.100 + configuration.getText("doclet.enums")); 23.101 + String[] enumTableHeader = new String[] { 23.102 + configuration.getText("doclet.Enum"), 23.103 + configuration.getText("doclet.Description") 23.104 + }; 23.105 + ClassDoc[] enums = 23.106 packageDoc.isIncluded() 23.107 ? packageDoc.enums() 23.108 : configuration.classDocCatalog.enums( 23.109 @@ -240,7 +276,8 @@ 23.110 if (enums.length > 0) { 23.111 packageWriter.writeClassesSummary( 23.112 enums, 23.113 - configuration.getText("doclet.Enum_Summary")); 23.114 + configuration.getText("doclet.Enum_Summary"), 23.115 + enumTableSummary, enumTableHeader); 23.116 } 23.117 } 23.118 23.119 @@ -248,7 +285,15 @@ 23.120 * Build the summary for the exceptions in this package. 23.121 */ 23.122 public void buildExceptionSummary() { 23.123 - ClassDoc[] exceptions = 23.124 + String exceptionTableSummary = 23.125 + configuration.getText("doclet.Member_Table_Summary", 23.126 + configuration.getText("doclet.Exception_Summary"), 23.127 + configuration.getText("doclet.exceptions")); 23.128 + String[] exceptionTableHeader = new String[] { 23.129 + configuration.getText("doclet.Exception"), 23.130 + configuration.getText("doclet.Description") 23.131 + }; 23.132 + ClassDoc[] exceptions = 23.133 packageDoc.isIncluded() 23.134 ? packageDoc.exceptions() 23.135 : configuration.classDocCatalog.exceptions( 23.136 @@ -256,7 +301,8 @@ 23.137 if (exceptions.length > 0) { 23.138 packageWriter.writeClassesSummary( 23.139 exceptions, 23.140 - configuration.getText("doclet.Exception_Summary")); 23.141 + configuration.getText("doclet.Exception_Summary"), 23.142 + exceptionTableSummary, exceptionTableHeader); 23.143 } 23.144 } 23.145 23.146 @@ -264,7 +310,15 @@ 23.147 * Build the summary for the errors in this package. 23.148 */ 23.149 public void buildErrorSummary() { 23.150 - ClassDoc[] errors = 23.151 + String errorTableSummary = 23.152 + configuration.getText("doclet.Member_Table_Summary", 23.153 + configuration.getText("doclet.Error_Summary"), 23.154 + configuration.getText("doclet.errors")); 23.155 + String[] errorTableHeader = new String[] { 23.156 + configuration.getText("doclet.Error"), 23.157 + configuration.getText("doclet.Description") 23.158 + }; 23.159 + ClassDoc[] errors = 23.160 packageDoc.isIncluded() 23.161 ? packageDoc.errors() 23.162 : configuration.classDocCatalog.errors( 23.163 @@ -272,7 +326,8 @@ 23.164 if (errors.length > 0) { 23.165 packageWriter.writeClassesSummary( 23.166 errors, 23.167 - configuration.getText("doclet.Error_Summary")); 23.168 + configuration.getText("doclet.Error_Summary"), 23.169 + errorTableSummary, errorTableHeader); 23.170 } 23.171 } 23.172
24.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Fri Mar 27 14:11:53 2009 -0700 24.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Tue Mar 31 08:54:12 2009 -0700 24.3 @@ -82,6 +82,7 @@ 24.4 doclet.Errors=Errors 24.5 doclet.Classes=Classes 24.6 doclet.Packages=Packages 24.7 +doclet.packages=packages 24.8 doclet.All_Classes=All Classes 24.9 doclet.All_Superinterfaces=All Superinterfaces: 24.10 doclet.All_Implemented_Interfaces=All Implemented Interfaces: 24.11 @@ -92,14 +93,20 @@ 24.12 doclet.Class=Class 24.13 doclet.AnnotationType=Annotation Type 24.14 doclet.annotationtype=annotation type 24.15 +doclet.annotationtypes=annotation types 24.16 doclet.Enum=Enum 24.17 doclet.enum=enum 24.18 +doclet.enums=enums 24.19 doclet.interface=interface 24.20 +doclet.interfaces=interfaces 24.21 doclet.class=class 24.22 +doclet.classes=classes 24.23 doclet.Error=Error 24.24 doclet.error=error 24.25 +doclet.errors=errors 24.26 doclet.Exception=Exception 24.27 doclet.exception=exception 24.28 +doclet.exceptions=exceptions 24.29 doclet.extended_by=extended by 24.30 doclet.extends=extends 24.31 doclet.Package_private=(package private) 24.32 @@ -125,6 +132,32 @@ 24.33 doclet.value_tag_invalid_constant=@value tag (which references {0}) can only be used in constants. 24.34 doclet.dest_dir_create=Creating destination directory: "{0}" 24.35 doclet.in={0} in {1} 24.36 +doclet.Use_Table_Summary=Use table, listing {0}, and an explanation 24.37 +doclet.Constants_Table_Summary={0} table, listing constant fields, and values 24.38 +doclet.Member_Table_Summary={0} table, listing {1}, and an explanation 24.39 +doclet.fields=fields 24.40 +doclet.constructors=constructors 24.41 +doclet.methods=methods 24.42 +doclet.annotation_type_optional_members=optional elements 24.43 +doclet.annotation_type_required_members=required elements 24.44 +doclet.enum_constants=enum constants 24.45 +doclet.nested_classes=nested classes 24.46 +doclet.subclasses=subclasses 24.47 +doclet.subinterfaces=subinterfaces 24.48 +doclet.Modifier=Modifier 24.49 +doclet.Type=Type 24.50 +doclet.Field=Field 24.51 +doclet.Constructor=Constructor 24.52 +doclet.Method=Method 24.53 +doclet.Annotation_Type_Optional_Member=Optional Element 24.54 +doclet.Annotation_Type_Required_Member=Required Element 24.55 +doclet.Annotation_Type_Member=Annotation Type Element 24.56 +doclet.Enum_Constant=Enum Constant 24.57 +doclet.Class=Class 24.58 +doclet.Description=Description 24.59 +doclet.ConstantField=Constant Field 24.60 +doclet.Value=Value 24.61 +doclet.0_and_1={0} and {1} 24.62 24.63 #Documentation for Enums 24.64 doclet.enum_values_doc=\n\
25.1 --- a/test/com/sun/javadoc/testHeadings/TestHeadings.java Fri Mar 27 14:11:53 2009 -0700 25.2 +++ b/test/com/sun/javadoc/testHeadings/TestHeadings.java Tue Mar 31 08:54:12 2009 -0700 25.3 @@ -47,14 +47,16 @@ 25.4 private static final String[][] TEST = { 25.5 //Package summary 25.6 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 25.7 - "<TH ALIGN=\"left\" COLSPAN=\"2\"><FONT SIZE=\"+2\">" + NL + 25.8 - "<STRONG>Class Summary</STRONG></FONT></TH>" 25.9 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 25.10 + "Class</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 25.11 + " NOWRAP>Description</TH>" 25.12 }, 25.13 25.14 // Class documentation 25.15 {BUG_ID + FS + "pkg1" + FS + "C1.html", 25.16 - "<TH ALIGN=\"left\" COLSPAN=\"2\"><FONT SIZE=\"+2\">" + NL + 25.17 - "<STRONG>Field Summary</STRONG></FONT></TH>" 25.18 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 25.19 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 25.20 + " SCOPE=\"col\" NOWRAP>Field and Description</TH>" 25.21 }, 25.22 {BUG_ID + FS + "pkg1" + FS + "C1.html", 25.23 "<TH ALIGN=\"left\"><STRONG>Methods inherited from class " + "java.lang.Object</STRONG></TH>" 25.24 @@ -62,29 +64,32 @@ 25.25 25.26 // Class use documentation 25.27 {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", 25.28 - "<TH ALIGN=\"left\" COLSPAN=\"2\"><FONT SIZE=\"+2\">" + NL + 25.29 - "Packages that use <A HREF=\"../../pkg1/C1.html\" " + "title=\"class in pkg1\">C1</A></FONT></TH>" 25.30 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 25.31 + "Package</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 25.32 + " SCOPE=\"col\" NOWRAP>Description</TH>" 25.33 }, 25.34 {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", 25.35 "<TH ALIGN=\"left\" COLSPAN=\"2\"><FONT SIZE=\"+2\">" + NL + 25.36 "Uses of <A HREF=\"../../pkg1/C1.html\" " + "title=\"class in pkg1\">C1</A> in " + "<A HREF=\"../../pkg2/package-summary.html\">pkg2</A></FONT></TH>" 25.37 }, 25.38 {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", 25.39 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Fields in " + "<A HREF=\"../../pkg2/package-summary.html\">pkg2</A> " + "declared as <A HREF=\"../../pkg1/C1.html\" " + "title=\"class in pkg1\">C1</A></FONT></TH>" 25.40 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 25.41 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 25.42 + " SCOPE=\"col\" NOWRAP>Field and Description</TH>" 25.43 }, 25.44 25.45 // Deprecated 25.46 {BUG_ID + FS + "deprecated-list.html", 25.47 - "<TH ALIGN=\"left\" COLSPAN=\"2\"><FONT SIZE=\"+2\">" + NL + 25.48 - "<STRONG>Deprecated Methods</STRONG></FONT></TH>" 25.49 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 25.50 + "Method and Description</TH>" 25.51 }, 25.52 25.53 // Constant values 25.54 {BUG_ID + FS + "constant-values.html", 25.55 - "<TH ALIGN=\"left\" COLSPAN=\"3\">pkg1.<A HREF=\"pkg1/C1.html\" " + "title=\"class in pkg1\">C1</A></TH>" 25.56 - }, 25.57 - {BUG_ID + FS + "constant-values.html", 25.58 - "<TH ALIGN=\"left\" COLSPAN=\"3\">pkg1.<A HREF=\"pkg1/C1.html\" " + "title=\"class in pkg1\">C1</A></TH>" 25.59 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 25.60 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 25.61 + " SCOPE=\"col\" NOWRAP>Constant Field</TH>" + NL + 25.62 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>Value</TH>" 25.63 }, 25.64 25.65 // Serialized Form
26.1 --- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Mar 27 14:11:53 2009 -0700 26.2 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Tue Mar 31 08:54:12 2009 -0700 26.3 @@ -25,7 +25,7 @@ 26.4 26.5 /* 26.6 * @test 26.7 - * @bug 6786690 26.8 + * @bug 6786690 6820360 26.9 * @summary This test verifies the nesting of definition list tags. 26.10 * @author Bhavesh Patel 26.11 * @library ../lib/ 26.12 @@ -36,7 +36,7 @@ 26.13 26.14 public class TestHtmlDefinitionListTag extends JavadocTester { 26.15 26.16 - private static final String BUG_ID = "6786690"; 26.17 + private static final String BUG_ID = "6786690-6820360"; 26.18 26.19 // Test common to all runs of javadoc. The class signature should print 26.20 // properly enclosed definition list tags and the Annotation Type 26.21 @@ -55,6 +55,9 @@ 26.22 // serialized form should have properly nested definition list tags 26.23 // enclosing comments, tags and deprecated information. 26.24 private static final String[][] TEST_CMNT_DEPR = { 26.25 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<DL>" + NL + 26.26 + "<DT><STRONG>Since:</STRONG></DT>" + NL + 26.27 + " <DD>JDK1.0</DD></DL>"}, 26.28 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<DL>" + NL + 26.29 "<DT><STRONG>Since:</STRONG></DT>" + NL + 26.30 " <DD>JDK1.0</DD>" + NL + "<DT><STRONG>See Also:</STRONG></DT><DD>" + 26.31 @@ -193,6 +196,9 @@ 26.32 // should display properly nested definition list tags for comments, tags 26.33 // and deprecated information. 26.34 private static final String[][] TEST_NODEPR = { 26.35 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<DL>" + NL + 26.36 + "<DT><STRONG>Since:</STRONG></DT>" + NL + 26.37 + " <DD>JDK1.0</DD></DL>"}, 26.38 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<DL>" + NL + 26.39 "<DT><STRONG>Since:</STRONG></DT>" + NL + 26.40 " <DD>JDK1.0</DD>" + NL + "<DT><STRONG>See Also:</STRONG></DT><DD>" + 26.41 @@ -302,6 +308,8 @@ 26.42 // Test for valid HTML generation which should not comprise of empty 26.43 // definition list tags. 26.44 private static final String[][] NEGATED_TEST = { 26.45 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<DL></DL>"}, 26.46 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<DL>" + NL + "</DL>"}, 26.47 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<DL></DL>"}, 26.48 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<DL>" + NL + "</DL>"}, 26.49 {BUG_ID + FS + "pkg1" + FS + "C1.ModalExclusionType.html", "<DL></DL>"},
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/package-info.java Tue Mar 31 08:54:12 2009 -0700 27.3 @@ -0,0 +1,29 @@ 27.4 +/* 27.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 27.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 27.7 + * 27.8 + * This code is free software; you can redistribute it and/or modify it 27.9 + * under the terms of the GNU General Public License version 2 only, as 27.10 + * published by the Free Software Foundation. 27.11 + * 27.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 27.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 27.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 27.15 + * version 2 for more details (a copy is included in the LICENSE file that 27.16 + * accompanied this code). 27.17 + * 27.18 + * You should have received a copy of the GNU General Public License version 27.19 + * 2 along with this work; if not, write to the Free Software Foundation, 27.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 27.21 + * 27.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 27.23 + * CA 95054 USA or visit www.sun.com if you need additional information or 27.24 + * have any questions. 27.25 + */ 27.26 + 27.27 +/** 27.28 + * Test package 1. 27.29 + * 27.30 + * @since JDK1.0 27.31 + */ 27.32 +package pkg1;
28.1 --- a/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Fri Mar 27 14:11:53 2009 -0700 28.2 +++ b/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Tue Mar 31 08:54:12 2009 -0700 28.3 @@ -38,14 +38,15 @@ 28.4 28.5 private static final String BUG_ID = "6786028"; 28.6 private static final String[][] TEST1 = { 28.7 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>See Also:</STRONG>"}}; 28.8 + private static final String[][] NEGATED_TEST1 = { 28.9 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>Method Summary</STRONG>"}, 28.10 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>See Also:</STRONG>"}, 28.11 + {BUG_ID + FS + "pkg1" + FS + "C1.html", "<B>"}, 28.12 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<STRONG>Class Summary</STRONG>"}}; 28.13 - private static final String[][] NEGATED_TEST1 = { 28.14 - {BUG_ID + FS + "pkg1" + FS + "C1.html", "<B>"}}; 28.15 private static final String[][] TEST2 = { 28.16 + {BUG_ID + FS + "pkg2" + FS + "C2.html", "<B>Comments:</B>"}}; 28.17 + private static final String[][] NEGATED_TEST2 = { 28.18 {BUG_ID + FS + "pkg2" + FS + "C2.html", "<STRONG>Method Summary</STRONG>"}, 28.19 - {BUG_ID + FS + "pkg2" + FS + "C2.html", "<B>Comments:</B>"}, 28.20 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<STRONG>Class Summary</STRONG>"}}; 28.21 28.22 private static final String[] ARGS1 = 28.23 @@ -62,7 +63,7 @@ 28.24 public static void main(String[] args) { 28.25 TestHtmlStrongTag tester = new TestHtmlStrongTag(); 28.26 run(tester, ARGS1, TEST1, NEGATED_TEST1); 28.27 - run(tester, ARGS2, TEST2, NO_TEST); 28.28 + run(tester, ARGS2, TEST2, NEGATED_TEST2); 28.29 tester.printSummary(); 28.30 } 28.31
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java Tue Mar 31 08:54:12 2009 -0700 29.3 @@ -0,0 +1,478 @@ 29.4 +/* 29.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 29.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 29.7 + * 29.8 + * This code is free software; you can redistribute it and/or modify it 29.9 + * under the terms of the GNU General Public License version 2 only, as 29.10 + * published by the Free Software Foundation. 29.11 + * 29.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 29.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 29.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 29.15 + * version 2 for more details (a copy is included in the LICENSE file that 29.16 + * accompanied this code). 29.17 + * 29.18 + * You should have received a copy of the GNU General Public License version 29.19 + * 2 along with this work; if not, write to the Free Software Foundation, 29.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 29.21 + * 29.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 29.23 + * CA 95054 USA or visit www.sun.com if you need additional information or 29.24 + * have any questions. 29.25 + */ 29.26 + 29.27 +/* 29.28 + * @test 29.29 + * @bug 6786688 29.30 + * @summary HTML tables should have table summary, caption and table headers. 29.31 + * @author Bhavesh Patel 29.32 + * @library ../lib/ 29.33 + * @build JavadocTester 29.34 + * @build TestHtmlTableTags 29.35 + * @run main TestHtmlTableTags 29.36 + */ 29.37 + 29.38 +public class TestHtmlTableTags extends JavadocTester { 29.39 + 29.40 + //Test information. 29.41 + private static final String BUG_ID = "6786688"; 29.42 + 29.43 + //Javadoc arguments. 29.44 + private static final String[] ARGS = new String[] { 29.45 + "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2" 29.46 + }; 29.47 + 29.48 + //Input for string tests for HTML table tags. 29.49 + private static final String[][] TABLE_TAGS_TEST = { 29.50 + /* 29.51 + * Test for validating summary for HTML tables 29.52 + */ 29.53 + 29.54 + //Package summary 29.55 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 29.56 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.57 + "CELLSPACING=\"0\" SUMMARY=\"Class Summary table, " + 29.58 + "listing classes, and an explanation\">" 29.59 + }, 29.60 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 29.61 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.62 + "CELLSPACING=\"0\" SUMMARY=\"Interface Summary table, " + 29.63 + "listing interfaces, and an explanation\">" 29.64 + }, 29.65 + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", 29.66 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.67 + "CELLSPACING=\"0\" SUMMARY=\"Enum Summary table, " + 29.68 + "listing enums, and an explanation\">" 29.69 + }, 29.70 + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", 29.71 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.72 + "CELLSPACING=\"0\" SUMMARY=\"Annotation Types Summary table, " + 29.73 + "listing annotation types, and an explanation\">" 29.74 + }, 29.75 + // Class documentation 29.76 + {BUG_ID + FS + "pkg1" + FS + "C1.html", 29.77 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.78 + "CELLSPACING=\"0\" SUMMARY=\"Field Summary table, " + 29.79 + "listing fields, and an explanation\">" 29.80 + }, 29.81 + {BUG_ID + FS + "pkg1" + FS + "C1.html", 29.82 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.83 + "CELLSPACING=\"0\" SUMMARY=\"Method Summary table, " + 29.84 + "listing methods, and an explanation\">" 29.85 + }, 29.86 + {BUG_ID + FS + "pkg2" + FS + "C2.html", 29.87 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.88 + "CELLSPACING=\"0\" SUMMARY=\"Nested Class Summary table, " + 29.89 + "listing nested classes, and an explanation\">" 29.90 + }, 29.91 + {BUG_ID + FS + "pkg2" + FS + "C2.html", 29.92 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.93 + "CELLSPACING=\"0\" SUMMARY=\"Constructor Summary table, " + 29.94 + "listing constructors, and an explanation\">" 29.95 + }, 29.96 + {BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html", 29.97 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.98 + "CELLSPACING=\"0\" SUMMARY=\"Enum Constant Summary table, " + 29.99 + "listing enum constants, and an explanation\">" 29.100 + }, 29.101 + {BUG_ID + FS + "pkg2" + FS + "C3.html", 29.102 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.103 + "CELLSPACING=\"0\" SUMMARY=\"Required Element Summary table, " + 29.104 + "listing required elements, and an explanation\">" 29.105 + }, 29.106 + {BUG_ID + FS + "pkg2" + FS + "C4.html", 29.107 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.108 + "CELLSPACING=\"0\" SUMMARY=\"Optional Element Summary table, " + 29.109 + "listing optional elements, and an explanation\">" 29.110 + }, 29.111 + // Class use documentation 29.112 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "I1.html", 29.113 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.114 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.115 + "listing packages, and an explanation\">" 29.116 + }, 29.117 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", 29.118 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.119 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.120 + "listing fields, and an explanation\">" 29.121 + }, 29.122 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", 29.123 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.124 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.125 + "listing methods, and an explanation\">" 29.126 + }, 29.127 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", 29.128 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.129 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.130 + "listing fields, and an explanation\">" 29.131 + }, 29.132 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", 29.133 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.134 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.135 + "listing methods, and an explanation\">" 29.136 + }, 29.137 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", 29.138 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.139 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.140 + "listing packages, and an explanation\">" 29.141 + }, 29.142 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", 29.143 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.144 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.145 + "listing methods, and an explanation\">" 29.146 + }, 29.147 + // Package use documentation 29.148 + {BUG_ID + FS + "pkg1" + FS + "package-use.html", 29.149 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.150 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.151 + "listing packages, and an explanation\">" 29.152 + }, 29.153 + {BUG_ID + FS + "pkg1" + FS + "package-use.html", 29.154 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.155 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.156 + "listing classes, and an explanation\">" 29.157 + }, 29.158 + {BUG_ID + FS + "pkg2" + FS + "package-use.html", 29.159 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.160 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.161 + "listing packages, and an explanation\">" 29.162 + }, 29.163 + {BUG_ID + FS + "pkg2" + FS + "package-use.html", 29.164 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.165 + "CELLSPACING=\"0\" SUMMARY=\"Use table, " + 29.166 + "listing classes, and an explanation\">" 29.167 + }, 29.168 + // Deprecated 29.169 + {BUG_ID + FS + "deprecated-list.html", 29.170 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.171 + "CELLSPACING=\"0\" SUMMARY=\"Deprecated Fields table, " + 29.172 + "listing deprecated fields, and an explanation\">" 29.173 + }, 29.174 + {BUG_ID + FS + "deprecated-list.html", 29.175 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.176 + "CELLSPACING=\"0\" SUMMARY=\"Deprecated Methods table, " + 29.177 + "listing deprecated methods, and an explanation\">" 29.178 + }, 29.179 + // Constant values 29.180 + {BUG_ID + FS + "constant-values.html", 29.181 + "<TABLE BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" " + 29.182 + "SUMMARY=\"Constant Field Values table, listing " + 29.183 + "constant fields, and values\">" 29.184 + }, 29.185 + // Overview Summary 29.186 + {BUG_ID + FS + "overview-summary.html", 29.187 + "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" " + 29.188 + "CELLSPACING=\"0\" SUMMARY=\"Packages table, " + 29.189 + "listing packages, and an explanation\">" 29.190 + }, 29.191 + 29.192 + /* 29.193 + * Test for validating caption for HTML tables 29.194 + */ 29.195 + 29.196 + //Package summary 29.197 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 29.198 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.199 + "Class Summary</CAPTION>" 29.200 + }, 29.201 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 29.202 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.203 + "Interface Summary</CAPTION>" 29.204 + }, 29.205 + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", 29.206 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.207 + "Enum Summary</CAPTION>" 29.208 + }, 29.209 + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", 29.210 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.211 + "Annotation Types Summary</CAPTION>" 29.212 + }, 29.213 + // Class documentation 29.214 + {BUG_ID + FS + "pkg1" + FS + "C1.html", 29.215 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.216 + "Field Summary</CAPTION>" 29.217 + }, 29.218 + {BUG_ID + FS + "pkg1" + FS + "C1.html", 29.219 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.220 + "Method Summary</CAPTION>" 29.221 + }, 29.222 + {BUG_ID + FS + "pkg2" + FS + "C2.html", 29.223 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.224 + "Nested Class Summary</CAPTION>" 29.225 + }, 29.226 + {BUG_ID + FS + "pkg2" + FS + "C2.html", 29.227 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.228 + "Constructor Summary</CAPTION>" 29.229 + }, 29.230 + {BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html", 29.231 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.232 + "Enum Constant Summary</CAPTION>" 29.233 + }, 29.234 + {BUG_ID + FS + "pkg2" + FS + "C3.html", 29.235 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.236 + "Required Element Summary</CAPTION>" 29.237 + }, 29.238 + {BUG_ID + FS + "pkg2" + FS + "C4.html", 29.239 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.240 + "Optional Element Summary</CAPTION>" 29.241 + }, 29.242 + // Class use documentation 29.243 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "I1.html", 29.244 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.245 + "Packages that use <A HREF=\"../../pkg1/I1.html\" " + 29.246 + "title=\"interface in pkg1\">I1</A></CAPTION>" 29.247 + }, 29.248 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", 29.249 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 29.250 + "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> " + 29.251 + "declared as <A HREF=\"../../pkg1/C1.html\" title=\"class in pkg1\">" + 29.252 + "C1</A></CAPTION>" 29.253 + }, 29.254 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", 29.255 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 29.256 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> " + 29.257 + "with parameters of type <A HREF=\"../../pkg1/C1.html\" " + 29.258 + "title=\"class in pkg1\">C1</A></CAPTION>" 29.259 + }, 29.260 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", 29.261 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 29.262 + "Fields in <A HREF=\"../../pkg1/package-summary.html\">pkg1</A> " + 29.263 + "declared as <A HREF=\"../../pkg2/C2.html\" title=\"class in pkg2\">" + 29.264 + "C2</A></CAPTION>" 29.265 + }, 29.266 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", 29.267 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 29.268 + "Methods in <A HREF=\"../../pkg1/package-summary.html\">pkg1</A> " + 29.269 + "with parameters of type <A HREF=\"../../pkg2/C2.html\" " + 29.270 + "title=\"class in pkg2\">C2</A></CAPTION>" 29.271 + }, 29.272 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", 29.273 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 29.274 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> " + 29.275 + "that return <A HREF=\"../../pkg2/C2.ModalExclusionType.html\" " + 29.276 + "title=\"enum in pkg2\">C2.ModalExclusionType</A></CAPTION>" 29.277 + }, 29.278 + // Package use documentation 29.279 + {BUG_ID + FS + "pkg1" + FS + "package-use.html", 29.280 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.281 + "Packages that use <A HREF=\"../pkg1/package-summary.html\">" + 29.282 + "pkg1</A></CAPTION>" 29.283 + }, 29.284 + {BUG_ID + FS + "pkg1" + FS + "package-use.html", 29.285 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.286 + "Classes in <A HREF=\"../pkg1/package-summary.html\">pkg1</A> " + 29.287 + "used by <A HREF=\"../pkg1/package-summary.html\">pkg1</A></CAPTION>" 29.288 + }, 29.289 + {BUG_ID + FS + "pkg2" + FS + "package-use.html", 29.290 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.291 + "Packages that use <A HREF=\"../pkg2/package-summary.html\">" + 29.292 + "pkg2</A></CAPTION>" 29.293 + }, 29.294 + {BUG_ID + FS + "pkg2" + FS + "package-use.html", 29.295 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.296 + "Classes in <A HREF=\"../pkg2/package-summary.html\">pkg2</A> " + 29.297 + "used by <A HREF=\"../pkg1/package-summary.html\">pkg1</A></CAPTION>" 29.298 + }, 29.299 + // Deprecated 29.300 + {BUG_ID + FS + "deprecated-list.html", 29.301 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.302 + "Deprecated Fields</CAPTION>" 29.303 + }, 29.304 + {BUG_ID + FS + "deprecated-list.html", 29.305 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.306 + "Deprecated Methods</CAPTION>" 29.307 + }, 29.308 + // Constant values 29.309 + {BUG_ID + FS + "constant-values.html", 29.310 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 29.311 + "pkg1.<A HREF=\"pkg1/C1.html\" title=\"class in pkg1\">C1</A></CAPTION>" 29.312 + }, 29.313 + // Overview Summary 29.314 + {BUG_ID + FS + "overview-summary.html", 29.315 + "<CAPTION CLASS=\"TableCaption\">" + NL + 29.316 + "Packages</CAPTION>" 29.317 + }, 29.318 + 29.319 + /* 29.320 + * Test for validating headers for HTML tables 29.321 + */ 29.322 + 29.323 + //Package summary 29.324 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 29.325 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.326 + "Class</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 29.327 + " NOWRAP>Description</TH>" 29.328 + }, 29.329 + {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 29.330 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.331 + "Interface</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 29.332 + " NOWRAP>Description</TH>" 29.333 + }, 29.334 + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", 29.335 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.336 + "Enum</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 29.337 + " NOWRAP>Description</TH>" 29.338 + }, 29.339 + {BUG_ID + FS + "pkg2" + FS + "package-summary.html", 29.340 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.341 + "Annotation Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.342 + " SCOPE=\"col\" NOWRAP>Description</TH>" 29.343 + }, 29.344 + // Class documentation 29.345 + {BUG_ID + FS + "pkg1" + FS + "C1.html", 29.346 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.347 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.348 + " SCOPE=\"col\" NOWRAP>Field and Description</TH>" 29.349 + }, 29.350 + {BUG_ID + FS + "pkg1" + FS + "C1.html", 29.351 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.352 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.353 + " SCOPE=\"col\" NOWRAP>Method and Description</TH>" 29.354 + }, 29.355 + {BUG_ID + FS + "pkg2" + FS + "C2.html", 29.356 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.357 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.358 + " SCOPE=\"col\" NOWRAP>Class and Description</TH>" 29.359 + }, 29.360 + {BUG_ID + FS + "pkg2" + FS + "C2.html", 29.361 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.362 + "Constructor and Description</TH>" 29.363 + }, 29.364 + {BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html", 29.365 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.366 + "Enum Constant and Description</TH>" 29.367 + }, 29.368 + {BUG_ID + FS + "pkg2" + FS + "C3.html", 29.369 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.370 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.371 + " SCOPE=\"col\" NOWRAP>Required Element and Description</TH>" 29.372 + }, 29.373 + {BUG_ID + FS + "pkg2" + FS + "C4.html", 29.374 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.375 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.376 + " SCOPE=\"col\" NOWRAP>Optional Element and Description</TH>" 29.377 + }, 29.378 + // Class use documentation 29.379 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "I1.html", 29.380 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.381 + "Package</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 29.382 + " NOWRAP>Description</TH>" 29.383 + }, 29.384 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", 29.385 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.386 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.387 + " SCOPE=\"col\" NOWRAP>Field and Description</TH>" 29.388 + }, 29.389 + {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", 29.390 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.391 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.392 + " SCOPE=\"col\" NOWRAP>Method and Description</TH>" 29.393 + }, 29.394 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", 29.395 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.396 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.397 + " SCOPE=\"col\" NOWRAP>Field and Description</TH>" 29.398 + }, 29.399 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", 29.400 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.401 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.402 + " SCOPE=\"col\" NOWRAP>Method and Description</TH>" 29.403 + }, 29.404 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", 29.405 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.406 + "Package</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 29.407 + " NOWRAP>Description</TH>" 29.408 + }, 29.409 + {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", 29.410 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.411 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.412 + " SCOPE=\"col\" NOWRAP>Method and Description</TH>" 29.413 + }, 29.414 + // Package use documentation 29.415 + {BUG_ID + FS + "pkg1" + FS + "package-use.html", 29.416 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.417 + "Package</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 29.418 + " NOWRAP>Description</TH>" 29.419 + }, 29.420 + {BUG_ID + FS + "pkg1" + FS + "package-use.html", 29.421 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.422 + "Class and Description</TH>" 29.423 + }, 29.424 + {BUG_ID + FS + "pkg2" + FS + "package-use.html", 29.425 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.426 + "Package</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 29.427 + " NOWRAP>Description</TH>" 29.428 + }, 29.429 + {BUG_ID + FS + "pkg2" + FS + "package-use.html", 29.430 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.431 + "Class and Description</TH>" 29.432 + }, 29.433 + // Deprecated 29.434 + {BUG_ID + FS + "deprecated-list.html", 29.435 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.436 + "Field and Description</TH>" 29.437 + }, 29.438 + {BUG_ID + FS + "deprecated-list.html", 29.439 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.440 + "Method and Description</TH>" 29.441 + }, 29.442 + // Constant values 29.443 + {BUG_ID + FS + "constant-values.html", 29.444 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.445 + "Modifier and Type</TH>" + NL + "<TH CLASS=\"TableHeader\"" + 29.446 + " SCOPE=\"col\" NOWRAP>Constant Field</TH>" + NL + 29.447 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>Value</TH>" 29.448 + }, 29.449 + // Overview Summary 29.450 + {BUG_ID + FS + "overview-summary.html", 29.451 + "<TH CLASS=\"TableHeader\" SCOPE=\"col\" NOWRAP>" + 29.452 + "Package</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 29.453 + " NOWRAP>Description</TH>" 29.454 + } 29.455 + }; 29.456 + private static final String[][] NEGATED_TEST = NO_TEST; 29.457 + 29.458 + /** 29.459 + * The entry point of the test. 29.460 + * @param args the array of command line arguments. 29.461 + */ 29.462 + public static void main(String[] args) { 29.463 + TestHtmlTableTags tester = new TestHtmlTableTags(); 29.464 + run(tester, ARGS, TABLE_TAGS_TEST, NEGATED_TEST); 29.465 + tester.printSummary(); 29.466 + } 29.467 + 29.468 + /** 29.469 + * {@inheritDoc} 29.470 + */ 29.471 + public String getBugId() { 29.472 + return BUG_ID; 29.473 + } 29.474 + 29.475 + /** 29.476 + * {@inheritDoc} 29.477 + */ 29.478 + public String getBugName() { 29.479 + return getClass().getName(); 29.480 + } 29.481 +}
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java Tue Mar 31 08:54:12 2009 -0700 30.3 @@ -0,0 +1,81 @@ 30.4 +/* 30.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 30.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 30.7 + * 30.8 + * This code is free software; you can redistribute it and/or modify it 30.9 + * under the terms of the GNU General Public License version 2 only, as 30.10 + * published by the Free Software Foundation. 30.11 + * 30.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 30.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 30.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 30.15 + * version 2 for more details (a copy is included in the LICENSE file that 30.16 + * accompanied this code). 30.17 + * 30.18 + * You should have received a copy of the GNU General Public License version 30.19 + * 2 along with this work; if not, write to the Free Software Foundation, 30.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 30.21 + * 30.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 30.23 + * CA 95054 USA or visit www.sun.com if you need additional information or 30.24 + * have any questions. 30.25 + */ 30.26 + 30.27 +package pkg1; 30.28 + 30.29 +import pkg2.*; 30.30 + 30.31 +/** 30.32 + * A test class. 30.33 + * 30.34 + * @author Bhavesh Patel 30.35 + */ 30.36 +public class C1 implements I1 { 30.37 + 30.38 + /** 30.39 + * Test field for class. 30.40 + */ 30.41 + public C2 field; 30.42 + 30.43 + /** 30.44 + * Constant value. 30.45 + */ 30.46 + public static final String CONSTANT1 = "C1"; 30.47 + 30.48 + /** 30.49 + * A test constructor. 30.50 + */ 30.51 + C1() { 30.52 + } 30.53 + 30.54 + /** 30.55 + * Method thats does some processing. 30.56 + * 30.57 + * @param param some parameter that is passed. 30.58 + * @return a sample object. 30.59 + */ 30.60 + public C2 method(C2 param) { 30.61 + return param; 30.62 + } 30.63 + 30.64 + /** 30.65 + * Method that is implemented. 30.66 + * 30.67 + * @param a some random value. 30.68 + * @param b some random value. 30.69 + */ 30.70 + public void method1(int a, int b) { 30.71 + } 30.72 + 30.73 + /** 30.74 + * Another inherited method. 30.75 + * @param c some value. 30.76 + */ 30.77 + public void method2(int c) { 30.78 + } 30.79 + 30.80 + /** 30.81 + * @deprecated don't use this anymore. 30.82 + */ 30.83 + public void deprecatedMethod() {} 30.84 +}
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java Tue Mar 31 08:54:12 2009 -0700 31.3 @@ -0,0 +1,48 @@ 31.4 +/* 31.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 31.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 31.7 + * 31.8 + * This code is free software; you can redistribute it and/or modify it 31.9 + * under the terms of the GNU General Public License version 2 only, as 31.10 + * published by the Free Software Foundation. 31.11 + * 31.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 31.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 31.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 31.15 + * version 2 for more details (a copy is included in the LICENSE file that 31.16 + * accompanied this code). 31.17 + * 31.18 + * You should have received a copy of the GNU General Public License version 31.19 + * 2 along with this work; if not, write to the Free Software Foundation, 31.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 31.21 + * 31.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 31.23 + * CA 95054 USA or visit www.sun.com if you need additional information or 31.24 + * have any questions. 31.25 + */ 31.26 + 31.27 +package pkg1; 31.28 + 31.29 +/** 31.30 + * A sample interface used to test table tags. 31.31 + * 31.32 + * @author Bhavesh Patel 31.33 + */ 31.34 +public interface I1 { 31.35 + 31.36 + /** 31.37 + * A test method. 31.38 + * 31.39 + * @param a blah. 31.40 + * @param b blah. 31.41 + */ 31.42 + void method1(int a, int b); 31.43 + 31.44 + /** 31.45 + * Another test method. 31.46 + * 31.47 + * @param c blah. 31.48 + */ 31.49 + void method2(int c); 31.50 + 31.51 +}
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/test/com/sun/javadoc/testHtmlTableTags/pkg1/package-info.java Tue Mar 31 08:54:12 2009 -0700 32.3 @@ -0,0 +1,27 @@ 32.4 +/* 32.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 32.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 32.7 + * 32.8 + * This code is free software; you can redistribute it and/or modify it 32.9 + * under the terms of the GNU General Public License version 2 only, as 32.10 + * published by the Free Software Foundation. 32.11 + * 32.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 32.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 32.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 32.15 + * version 2 for more details (a copy is included in the LICENSE file that 32.16 + * accompanied this code). 32.17 + * 32.18 + * You should have received a copy of the GNU General Public License version 32.19 + * 2 along with this work; if not, write to the Free Software Foundation, 32.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 32.21 + * 32.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 32.23 + * CA 95054 USA or visit www.sun.com if you need additional information or 32.24 + * have any questions. 32.25 + */ 32.26 + 32.27 +/** 32.28 + * Test package 1 used to test table tags. 32.29 + */ 32.30 +package pkg1;
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/test/com/sun/javadoc/testHtmlTableTags/pkg2/C2.java Tue Mar 31 08:54:12 2009 -0700 33.3 @@ -0,0 +1,73 @@ 33.4 +/* 33.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 33.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 33.7 + * 33.8 + * This code is free software; you can redistribute it and/or modify it 33.9 + * under the terms of the GNU General Public License version 2 only, as 33.10 + * published by the Free Software Foundation. 33.11 + * 33.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 33.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 33.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 33.15 + * version 2 for more details (a copy is included in the LICENSE file that 33.16 + * accompanied this code). 33.17 + * 33.18 + * You should have received a copy of the GNU General Public License version 33.19 + * 2 along with this work; if not, write to the Free Software Foundation, 33.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 33.21 + * 33.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 33.23 + * CA 95054 USA or visit www.sun.com if you need additional information or 33.24 + * have any questions. 33.25 + */ 33.26 + 33.27 +package pkg2; 33.28 + 33.29 +import pkg1.*; 33.30 + 33.31 +/** 33.32 + * Another test class. 33.33 + * 33.34 + * @author Bhavesh Patel 33.35 + */ 33.36 +public class C2 { 33.37 + 33.38 + /** 33.39 + * A test field. 33.40 + */ 33.41 + public C1 field; 33.42 + 33.43 + /** 33.44 + * @deprecated don't use this field anymore. 33.45 + */ 33.46 + public C1 dep_field; 33.47 + 33.48 + /** 33.49 + * A sample enum. 33.50 + */ 33.51 + public static enum ModalExclusionType { 33.52 + /** 33.53 + * Test comment. 33.54 + */ 33.55 + NO_EXCLUDE, 33.56 + /** 33.57 + * Another comment. 33.58 + */ 33.59 + APPLICATION_EXCLUDE 33.60 + }; 33.61 + 33.62 + /** 33.63 + * A string constant. 33.64 + */ 33.65 + public static final String CONSTANT1 = "C2"; 33.66 + 33.67 + /** 33.68 + * A sample method. 33.69 + * 33.70 + * @param param some parameter. 33.71 + * @return a test object. 33.72 + */ 33.73 + public C1 method(C1 param) { 33.74 + return param; 33.75 + } 33.76 +}
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 34.2 +++ b/test/com/sun/javadoc/testHtmlTableTags/pkg2/C3.java Tue Mar 31 08:54:12 2009 -0700 34.3 @@ -0,0 +1,40 @@ 34.4 +/* 34.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 34.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 34.7 + * 34.8 + * This code is free software; you can redistribute it and/or modify it 34.9 + * under the terms of the GNU General Public License version 2 only, as 34.10 + * published by the Free Software Foundation. Sun designates this 34.11 + * particular file as subject to the "Classpath" exception as provided 34.12 + * by Sun in the LICENSE file that accompanied this code. 34.13 + * 34.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 34.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 34.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 34.17 + * version 2 for more details (a copy is included in the LICENSE file that 34.18 + * accompanied this code). 34.19 + * 34.20 + * You should have received a copy of the GNU General Public License version 34.21 + * 2 along with this work; if not, write to the Free Software Foundation, 34.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 34.23 + * 34.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 34.25 + * CA 95054 USA or visit www.sun.com if you need additional information or 34.26 + * have any questions. 34.27 + */ 34.28 + 34.29 +package pkg2; 34.30 + 34.31 +import java.lang.annotation.*; 34.32 + 34.33 +/** 34.34 + * Test Annotation class. 34.35 + * 34.36 + * @author Bhavesh Patel 34.37 + */ 34.38 +public @interface C3 { 34.39 + /** 34.40 + * Comment. 34.41 + */ 34.42 + String[] value(); 34.43 +}
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/test/com/sun/javadoc/testHtmlTableTags/pkg2/C4.java Tue Mar 31 08:54:12 2009 -0700 35.3 @@ -0,0 +1,35 @@ 35.4 +/* 35.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 35.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 35.7 + * 35.8 + * This code is free software; you can redistribute it and/or modify it 35.9 + * under the terms of the GNU General Public License version 2 only, as 35.10 + * published by the Free Software Foundation. Sun designates this 35.11 + * particular file as subject to the "Classpath" exception as provided 35.12 + * by Sun in the LICENSE file that accompanied this code. 35.13 + * 35.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 35.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 35.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 35.17 + * version 2 for more details (a copy is included in the LICENSE file that 35.18 + * accompanied this code). 35.19 + * 35.20 + * You should have received a copy of the GNU General Public License version 35.21 + * 2 along with this work; if not, write to the Free Software Foundation, 35.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 35.23 + * 35.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 35.25 + * CA 95054 USA or visit www.sun.com if you need additional information or 35.26 + * have any questions. 35.27 + */ 35.28 + 35.29 +package pkg2; 35.30 + 35.31 +import java.lang.annotation.*; 35.32 + 35.33 +/* 35.34 + * A sample interface. 35.35 + */ 35.36 +public @interface C4 { 35.37 + boolean value() default true; 35.38 +}
36.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 36.2 +++ b/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java Tue Mar 31 08:54:12 2009 -0700 36.3 @@ -0,0 +1,27 @@ 36.4 +/* 36.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 36.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 36.7 + * 36.8 + * This code is free software; you can redistribute it and/or modify it 36.9 + * under the terms of the GNU General Public License version 2 only, as 36.10 + * published by the Free Software Foundation. 36.11 + * 36.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 36.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 36.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 36.15 + * version 2 for more details (a copy is included in the LICENSE file that 36.16 + * accompanied this code). 36.17 + * 36.18 + * You should have received a copy of the GNU General Public License version 36.19 + * 2 along with this work; if not, write to the Free Software Foundation, 36.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 36.21 + * 36.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 36.23 + * CA 95054 USA or visit www.sun.com if you need additional information or 36.24 + * have any questions. 36.25 + */ 36.26 + 36.27 +/** 36.28 + * Test package 2 used to test table tags. 36.29 + */ 36.30 +package pkg2;
37.1 --- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Mar 27 14:11:53 2009 -0700 37.2 +++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue Mar 31 08:54:12 2009 -0700 37.3 @@ -58,7 +58,8 @@ 37.4 "<A HREF=\"../pkg/Coin.html\" title=\"enum in pkg\">Coin</A>>" 37.5 }, 37.6 //Check for enum constant section 37.7 - {BUG_ID + FS + "pkg" + FS + "Coin.html", "<STRONG>Enum Constant Summary</STRONG>"}, 37.8 + {BUG_ID + FS + "pkg" + FS + "Coin.html", "<CAPTION CLASS=\"TableCaption\">" + NL + 37.9 + "Enum Constant Summary</CAPTION>"}, 37.10 //Detail for enum constant 37.11 {BUG_ID + FS + "pkg" + FS + "Coin.html", 37.12 "<STRONG><A HREF=\"../pkg/Coin.html#Dime\">Dime</A></STRONG>"}, 37.13 @@ -158,9 +159,11 @@ 37.14 "public @interface <STRONG>AnnotationType</STRONG>"}, 37.15 //Make sure member summary headings are correct. 37.16 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 37.17 - "<STRONG>Required Element Summary</STRONG>"}, 37.18 + "<CAPTION CLASS=\"TableCaption\">" + NL + 37.19 + "Required Element Summary</CAPTION>"}, 37.20 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 37.21 - "<STRONG>Optional Element Summary</STRONG>"}, 37.22 + "<CAPTION CLASS=\"TableCaption\">" + NL + 37.23 + "Optional Element Summary</CAPTION>"}, 37.24 //Make sure element detail heading is correct 37.25 {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", 37.26 "Element Detail"}, 37.27 @@ -286,39 +289,57 @@ 37.28 37.29 //ClassUseTest1: <T extends Foo & Foo2> 37.30 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 37.31 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A></FONT></TH>" 37.32 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.33 + "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.34 + "</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" " + 37.35 + "title=\"class in pkg2\">Foo</A></CAPTION>" 37.36 }, 37.37 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 37.38 "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></STRONG></CODE>" 37.39 }, 37.40 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 37.41 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A></FONT></TH>" 37.42 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.43 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.44 + "</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" " + 37.45 + "title=\"class in pkg2\">Foo</A></CAPTION>" 37.46 }, 37.47 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 37.48 "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T t)</CODE>" 37.49 }, 37.50 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 37.51 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A></FONT></TH>" 37.52 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.53 + "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.54 + "</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" " + 37.55 + "title=\"class in pkg2\">Foo</A></CAPTION>" 37.56 }, 37.57 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", 37.58 "<A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A><<A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A>></CODE></FONT></TD>" 37.59 }, 37.60 37.61 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.62 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>" 37.63 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.64 + "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.65 + "</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" " + 37.66 + "title=\"class in pkg2\">ParamTest</A></CAPTION>" 37.67 }, 37.68 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.69 "<A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A><<A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A>></CODE></FONT></TD>" 37.70 }, 37.71 37.72 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", 37.73 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">Foo2</A></FONT></TH>" 37.74 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.75 + "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.76 + "</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" " + 37.77 + "title=\"interface in pkg2\">Foo2</A></CAPTION>" 37.78 }, 37.79 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", 37.80 "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></STRONG></CODE>" 37.81 }, 37.82 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", 37.83 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">Foo2</A></FONT></TH>" 37.84 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.85 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.86 + "</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" " + 37.87 + "title=\"interface in pkg2\">Foo2</A></CAPTION>" 37.88 }, 37.89 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", 37.90 "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T t)</CODE>" 37.91 @@ -326,44 +347,66 @@ 37.92 37.93 //ClassUseTest2: <T extends ParamTest<Foo3>> 37.94 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.95 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>" 37.96 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.97 + "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.98 + "</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" " + 37.99 + "title=\"class in pkg2\">ParamTest</A></CAPTION>" 37.100 }, 37.101 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.102 "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></STRONG></CODE>" 37.103 }, 37.104 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.105 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>" 37.106 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.107 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.108 + "</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" " + 37.109 + "title=\"class in pkg2\">ParamTest</A></CAPTION>" 37.110 }, 37.111 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.112 "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T t)</CODE>" 37.113 }, 37.114 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.115 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>" 37.116 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.117 + "Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.118 + "</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" " + 37.119 + "title=\"class in pkg2\">ParamTest</A></CAPTION>" 37.120 }, 37.121 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.122 "<A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A><<A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A>></CODE></FONT></TD>" 37.123 }, 37.124 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.125 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>" 37.126 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.127 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.128 + "</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" " + 37.129 + "title=\"class in pkg2\">ParamTest</A></CAPTION>" 37.130 }, 37.131 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", 37.132 "<T extends <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A><<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>>" 37.133 }, 37.134 37.135 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 37.136 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A></FONT></TH>" 37.137 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.138 + "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.139 + "</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" " + 37.140 + "title=\"class in pkg2\">Foo3</A></CAPTION>" 37.141 }, 37.142 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 37.143 "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></STRONG></CODE>" 37.144 }, 37.145 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 37.146 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A></FONT></TH>" 37.147 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.148 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.149 + "</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" " + 37.150 + "title=\"class in pkg2\">Foo3</A></CAPTION>" 37.151 }, 37.152 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 37.153 "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T t)</CODE>" 37.154 }, 37.155 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 37.156 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> that return types with arguments of type <A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A></FONT></TH>" 37.157 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.158 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.159 + "</A> that return types with arguments of type " + 37.160 + "<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" + 37.161 + "Foo3</A></CAPTION>" 37.162 }, 37.163 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html", 37.164 "<T extends <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A><<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>>" 37.165 @@ -371,38 +414,61 @@ 37.166 37.167 //ClassUseTest3: <T extends ParamTest2<List<? extends Foo4>>> 37.168 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 37.169 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A></FONT></TH>" 37.170 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.171 + "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.172 + "</A> with type parameters of type " + 37.173 + "<A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" + 37.174 + "ParamTest2</A></CAPTION>" 37.175 }, 37.176 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 37.177 "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></STRONG></CODE>" 37.178 }, 37.179 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 37.180 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A></FONT></TH>" 37.181 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.182 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.183 + "</A> with type parameters of type " + 37.184 + "<A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" + 37.185 + "ParamTest2</A></CAPTION>" 37.186 }, 37.187 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 37.188 "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T t)</CODE>" 37.189 }, 37.190 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 37.191 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A></FONT></TH>" 37.192 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.193 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.194 + "</A> with type parameters of type " + 37.195 + "<A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" + 37.196 + "ParamTest2</A></CAPTION>" 37.197 }, 37.198 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html", 37.199 "<T extends <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A><java.util.List<? extends <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>>>>" 37.200 }, 37.201 37.202 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 37.203 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>" 37.204 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.205 + "Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.206 + "</A> with type parameters of type " + 37.207 + "<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" + 37.208 + "Foo4</A></CAPTION>" 37.209 }, 37.210 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 37.211 "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></STRONG></CODE>" 37.212 }, 37.213 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 37.214 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>" 37.215 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.216 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.217 + "</A> with type parameters of type <A HREF=\"../../pkg2/Foo4.html\" " + 37.218 + "title=\"class in pkg2\">Foo4</A></CAPTION>" 37.219 }, 37.220 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 37.221 "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T t)</CODE>" 37.222 }, 37.223 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 37.224 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> that return types with arguments of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>" 37.225 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.226 + "Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.227 + "</A> that return types with arguments of type " + 37.228 + "<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" + 37.229 + "Foo4</A></CAPTION>" 37.230 }, 37.231 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 37.232 "<T extends <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A><java.util.List<? extends <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>>>>" 37.233 @@ -410,81 +476,147 @@ 37.234 37.235 //Type parameters in constructor and method args 37.236 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 37.237 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Method parameters in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>" + NL + 37.238 - "</TR>" + NL + 37.239 - "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.240 - "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.241 - "<CODE> void</CODE></FONT></TD>" + NL + 37.242 - "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(java.util.Set)\">method</A></STRONG>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>" 37.243 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.244 + "Method parameters in <A HREF=\"../../pkg2/package-summary.html\">pkg2" + 37.245 + "</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" " + 37.246 + "title=\"class in pkg2\">Foo4</A></CAPTION>" + NL + 37.247 + "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.248 + " NOWRAP>Modifier and Type" + 37.249 + "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.250 + " NOWRAP>Method and Description</TH>" + NL + 37.251 + "</TR>" + NL + 37.252 + "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.253 + "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.254 + "<CODE> void</CODE></FONT></TD>" + NL + 37.255 + "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG>" + 37.256 + "<A HREF=\"../../pkg2/ClassUseTest3.html#method(java.util.Set)\">" + 37.257 + "method</A></STRONG>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" " + 37.258 + "title=\"class in pkg2\">Foo4</A>> p)</CODE>" 37.259 }, 37.260 {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html", 37.261 - "<TH ALIGN=\"left\" COLSPAN=\"2\">Constructor parameters in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>" + NL + 37.262 - "</TR>" + NL + 37.263 - "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.264 - "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#ClassUseTest3(java.util.Set)\">ClassUseTest3</A></STRONG>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>" 37.265 + "<CAPTION CLASS=\"TableSubCaption\">" + NL + 37.266 + "Constructor parameters in <A HREF=\"../../pkg2/package-summary.html\">" + 37.267 + "pkg2</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" " + 37.268 + "title=\"class in pkg2\">Foo4</A></CAPTION>" + NL + 37.269 + "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.270 + " NOWRAP>Constructor and Description" + 37.271 + "</TH>" + NL + "</TR>" + NL + 37.272 + "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.273 + "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#ClassUseTest3" + 37.274 + "(java.util.Set)\">ClassUseTest3</A></STRONG>(java.util.Set<" + 37.275 + "<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" + 37.276 + "Foo4</A>> p)</CODE>" 37.277 }, 37.278 37.279 //================================= 37.280 // Annotatation Type Usage 37.281 //================================= 37.282 {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", 37.283 - "<FONT SIZE=\"+2\">" + NL + 37.284 - "Packages with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL + 37.285 - "</TR>" + NL + 37.286 - "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.287 - "<TD><A HREF=\"../../pkg/package-summary.html\"><STRONG>pkg</STRONG></A></TD>" 37.288 + "Packages with annotations of type " + 37.289 + "<A HREF=\"../../pkg/AnnotationType.html\" " + 37.290 + "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL + 37.291 + "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.292 + " NOWRAP>Package" + 37.293 + "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.294 + " NOWRAP>Description</TH>" + NL + "</TR>" + NL + 37.295 + "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.296 + "<TD><A HREF=\"../../pkg/package-summary.html\"><STRONG>pkg" + 37.297 + "</STRONG></A></TD>" 37.298 }, 37.299 37.300 {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", 37.301 - "Classes in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL + 37.302 - "</TR>" + NL + 37.303 - "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.304 - "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.305 - "<CODE> class</CODE></FONT></TD>" + NL + 37.306 - "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html\" title=\"class in pkg\">AnnotationTypeUsage</A></STRONG></CODE>" 37.307 + "Classes in <A HREF=\"../../pkg/package-summary.html\">pkg" + 37.308 + "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " + 37.309 + "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL + 37.310 + "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.311 + " NOWRAP>Modifier and Type" + 37.312 + "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.313 + " NOWRAP>Class and Description</TH>" + NL + 37.314 + "</TR>" + NL + 37.315 + "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.316 + "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.317 + "<CODE> class</CODE></FONT></TD>" + NL + 37.318 + "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html\" " + 37.319 + "title=\"class in pkg\">AnnotationTypeUsage</A></STRONG></CODE>" 37.320 }, 37.321 37.322 {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", 37.323 - "Fields in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL + 37.324 - "</TR>" + NL + 37.325 - "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.326 - "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.327 - "<CODE> int</CODE></FONT></TD>" + NL + 37.328 - "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#field\">field</A></STRONG></CODE>" 37.329 + "Fields in <A HREF=\"../../pkg/package-summary.html\">pkg" + 37.330 + "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " + 37.331 + "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL + 37.332 + "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.333 + " NOWRAP>Modifier and Type" + 37.334 + "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.335 + " NOWRAP>Field and Description</TH>" + NL + 37.336 + "</TR>" + NL + 37.337 + "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.338 + "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.339 + "<CODE> int</CODE></FONT></TD>" + NL + 37.340 + "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG>" + 37.341 + "<A HREF=\"../../pkg/AnnotationTypeUsage.html#field\">field" + 37.342 + "</A></STRONG></CODE>" 37.343 }, 37.344 37.345 {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", 37.346 - "Methods in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL + 37.347 - "</TR>" + NL + 37.348 - "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.349 - "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.350 - "<CODE> void</CODE></FONT></TD>" + NL + 37.351 - "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#method()\">method</A></STRONG>()</CODE>" 37.352 + "Methods in <A HREF=\"../../pkg/package-summary.html\">pkg" + 37.353 + "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " + 37.354 + "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL + 37.355 + "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.356 + " NOWRAP>Modifier and Type" + 37.357 + "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.358 + " NOWRAP>Method and Description</TH>" + NL + 37.359 + "</TR>" + NL + 37.360 + "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.361 + "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.362 + "<CODE> void</CODE></FONT></TD>" + NL + 37.363 + "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG>" + 37.364 + "<A HREF=\"../../pkg/AnnotationTypeUsage.html#method()\">" + 37.365 + "method</A></STRONG>()</CODE>" 37.366 }, 37.367 37.368 {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", 37.369 - "Method parameters in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL + 37.370 - "</TR>" + NL + 37.371 - "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.372 - "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.373 - "<CODE> void</CODE></FONT></TD>" + NL + 37.374 - "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#methodWithParams(int, int)\">methodWithParams</A></STRONG>(int documented," + NL + 37.375 - " int undocmented)</CODE>" 37.376 + "Method parameters in <A HREF=\"../../pkg/package-summary.html\">pkg" + 37.377 + "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " + 37.378 + "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL + 37.379 + "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.380 + " NOWRAP>Modifier and Type" + 37.381 + "</TH>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.382 + " NOWRAP>Method and Description</TH>" + NL + 37.383 + "</TR>" + NL + 37.384 + "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.385 + "<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL + 37.386 + "<CODE> void</CODE></FONT></TD>" + NL + 37.387 + "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG>" + 37.388 + "<A HREF=\"../../pkg/AnnotationTypeUsage.html#methodWithParams" + 37.389 + "(int, int)\">methodWithParams</A></STRONG>(int documented," + NL + 37.390 + " int undocmented)</CODE>" 37.391 }, 37.392 37.393 {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", 37.394 - "Constructors in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL + 37.395 - "</TR>" + NL + 37.396 - "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.397 - "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage()\">AnnotationTypeUsage</A></STRONG>()</CODE>" 37.398 + "Constructors in <A HREF=\"../../pkg/package-summary.html\">pkg" + 37.399 + "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " + 37.400 + "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL + 37.401 + "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.402 + " NOWRAP>Constructor and Description" + 37.403 + "</TH>" + NL + "</TR>" + NL + 37.404 + "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.405 + "<TD><CODE><STRONG><A HREF=\"../../pkg/" + 37.406 + "AnnotationTypeUsage.html#AnnotationTypeUsage()\">" + 37.407 + "AnnotationTypeUsage</A></STRONG>()</CODE>" 37.408 }, 37.409 37.410 {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html", 37.411 - "Constructor parameters in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL + 37.412 - "</TR>" + NL + 37.413 - "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.414 - "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage(int, int)\">AnnotationTypeUsage</A></STRONG>(int documented," + NL + 37.415 - " int undocmented)</CODE>" 37.416 + "Constructor parameters in <A HREF=\"../../pkg/package-summary.html\">pkg" + 37.417 + "</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" " + 37.418 + "title=\"annotation in pkg\">AnnotationType</A></CAPTION>" + NL + 37.419 + "<TR>" + NL + "<TH CLASS=\"TableHeader\" SCOPE=\"col\"" + 37.420 + " NOWRAP>Constructor and Description" + 37.421 + "</TH>" + NL + "</TR>" + NL + 37.422 + "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL + 37.423 + "<TD><CODE><STRONG><A HREF=\"../../pkg/" + 37.424 + "AnnotationTypeUsage.html#AnnotationTypeUsage(int, int)\">" + 37.425 + "AnnotationTypeUsage</A></STRONG>(int documented," + NL + 37.426 + " int undocmented)</CODE>" 37.427 }, 37.428 37.429 //=================================
38.1 --- a/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Fri Mar 27 14:11:53 2009 -0700 38.2 +++ b/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Tue Mar 31 08:54:12 2009 -0700 38.3 @@ -46,7 +46,8 @@ 38.4 38.5 //Input for string search tests. 38.6 private static final String[][] TEST = { 38.7 - {BUG_ID + FS + "C.html", "<STRONG>Method Summary</STRONG>"} 38.8 + {BUG_ID + FS + "C.html", "<CAPTION CLASS=\"TableCaption\">" + NL + 38.9 + "Method Summary</CAPTION>"} 38.10 }; 38.11 private static final String[][] NEGATED_TEST = NO_TEST; 38.12
39.1 --- a/test/tools/javap/T4884240.java Fri Mar 27 14:11:53 2009 -0700 39.2 +++ b/test/tools/javap/T4884240.java Tue Mar 31 08:54:12 2009 -0700 39.3 @@ -16,7 +16,7 @@ 39.4 * 39.5 * You should have received a copy of the GNU General Public License version 39.6 * 2 along with this work; if not, write to the Free Software Foundation, 39.7 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-15301 USA. 39.8 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 39.9 * 39.10 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 39.11 * CA 95054 USA or visit www.sun.com if you need additional information or
