# HG changeset patch # User bpatel # Date 1231460819 28800 # Node ID 1aa079321cd2741faaeac4302dfc8fd64e4c74f7 # Parent d4c11dcedac3297f52ed5259acf230799d0a64d1 6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong Reviewed-by: jjg diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -71,7 +71,7 @@ member.position().line() != classdoc.position().line()) { writer.printSrcLink(member, member.name()); } else { - bold(member.name()); + strong(member.name()); } writeParameters(member); writeExceptions(member); @@ -87,10 +87,10 @@ protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) { ExecutableMemberDoc emd = (ExecutableMemberDoc)member; String name = emd.name(); - writer.bold(); + writer.strong(); writer.printDocLink(context, cd, (MemberDoc) emd, name, false); - writer.boldEnd(); + writer.strongEnd(); writer.displayLength = name.length(); writeParameters(emd, false); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -78,12 +78,12 @@ } /** - * Print the text "Index" in bold format in the navigation bar. + * Print the text "Index" in strong format in the navigation bar. */ protected void navLinkIndex() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.Index"); + strongText("doclet.Index"); fontEnd(); navCellEnd(); } @@ -98,7 +98,7 @@ protected void generateContents(Character unicode, List memberlist) { anchor("_" + unicode + "_"); h2(); - bold(unicode.toString()); + strong(unicode.toString()); h2End(); dl(); for (int i = 0; i < memberlist.size(); i++) { @@ -195,14 +195,14 @@ protected void printComment(ProgramElementDoc element) { Tag[] tags; if (Util.isDeprecated(element)) { - boldText("doclet.Deprecated"); space(); + strongText("doclet.Deprecated"); space(); if ((tags = element.tags("deprecated")).length > 0) printInlineDeprecatedComment(element, tags[0]); } else { ClassDoc cont = element.containingClass(); while (cont != null) { if (Util.isDeprecated(cont)) { - boldText("doclet.Deprecated"); space(); + strongText("doclet.Deprecated"); space(); break; } cont = cont.containingClass(); diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -98,8 +98,8 @@ writer.displayLength++; } - protected void bold(String str) { - writer.bold(str); + protected void strong(String str) { + writer.strong(str); writer.displayLength += str.length(); } @@ -321,7 +321,7 @@ if (deprmembers.size() > 0) { writer.tableIndexSummary(); writer.tableHeaderStart("#CCCCFF"); - writer.boldText(headingKey); + writer.strongText(headingKey); writer.tableHeaderEnd(); for (int i = 0; i < deprmembers.size(); i++) { ProgramElementDoc member =(ProgramElementDoc)deprmembers.get(i); @@ -363,7 +363,7 @@ if (cd != null && !(pgmdoc instanceof ConstructorDoc) && !(pgmdoc instanceof ClassDoc)) { // Add class context - writer.bold(cd.name() + "."); + writer.strong(cd.name() + "."); } writeSummaryLink( pgmdoc instanceof ClassDoc ? diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -137,13 +137,13 @@ } /** - * Highlight "Overview" in the bold format, in the navigation bar as this + * Highlight "Overview" in the strong format, in the navigation bar as this * is the overview page. */ protected void navLinkContents() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.Overview"); + strongText("doclet.Overview"); fontEnd(); navCellEnd(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -173,7 +173,7 @@ */ protected void printPartialInfo(ClassDoc cd) { li("circle"); - printPreQualifiedBoldClassLink(LinkInfoImpl.CONTEXT_TREE, cd); + printPreQualifiedStrongClassLink(LinkInfoImpl.CONTEXT_TREE, cd); } /** @@ -193,7 +193,7 @@ protected void navLinkTree() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.Tree"); + strongText("doclet.Tree"); fontEnd(); navCellEnd(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -160,7 +160,7 @@ */ protected void printAllClassesTableHeader() { fontSizeStyle("+1", "FrameHeadingFont"); - boldText("doclet.All_Classes"); + strongText("doclet.All_Classes"); fontEnd(); br(); table(); diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -65,7 +65,7 @@ public void writeDefaultValueInfo(MemberDoc member) { writer.dl(); writer.dt(); - writer.bold(ConfigurationImpl.getInstance(). + writer.strong(ConfigurationImpl.getInstance(). getText("doclet.Default")); writer.dd(); writer.print(((AnnotationTypeElementDoc) member).defaultValue()); @@ -84,7 +84,7 @@ * {@inheritDoc} */ public void printSummaryLabel(ClassDoc cd) { - writer.boldText("doclet.Annotation_Type_Optional_Member_Summary"); + writer.strongText("doclet.Annotation_Type_Optional_Member_Summary"); } /** diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -131,7 +131,7 @@ if (configuration().linksource) { writer.printSrcLink(member, member.name()); } else { - bold(member.name()); + strong(member.name()); } writer.preEnd(); writer.dl(); @@ -183,7 +183,7 @@ * {@inheritDoc} */ public void printSummaryLabel(ClassDoc cd) { - writer.boldText("doclet.Annotation_Type_Required_Member_Summary"); + writer.strongText("doclet.Annotation_Type_Required_Member_Summary"); } /** @@ -210,9 +210,9 @@ * {@inheritDoc} */ protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) { - writer.bold(); + writer.strong(); writer.printDocLink(context, (MemberDoc) member, member.name(), false); - writer.boldEnd(); + writer.strongEnd(); } /** diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -84,7 +84,7 @@ protected void navLinkClass() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.Class"); + strongText("doclet.Class"); fontEnd(); navCellEnd(); } @@ -176,7 +176,7 @@ if (configuration().linksource) { printSrcLink(annotationType, name); } else { - bold(name); + strong(name); } dlEnd(); preEnd(); @@ -220,7 +220,7 @@ hr(); Tag[] deprs = annotationType.tags("deprecated"); if (Util.isDeprecated(annotationType)) { - boldText("doclet.Deprecated"); + strongText("doclet.Deprecated"); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags(); if (commentTags.length > 0) { @@ -330,9 +330,9 @@ dl(); dt(); if (annotationType.isInterface()) { - boldText("doclet.Enclosing_Interface"); + strongText("doclet.Enclosing_Interface"); } else { - boldText("doclet.Enclosing_Class"); + strongText("doclet.Enclosing_Class"); } dd(); printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS, outerClass, diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -394,7 +394,7 @@ hr(); center(); h2(); - boldText("doclet.ClassUse_Title", cltype, clname); + strongText("doclet.ClassUse_Title", cltype, clname); h2End(); centerEnd(); } @@ -436,7 +436,7 @@ protected void navLinkClassUse() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.navClassUse"); + strongText("doclet.navClassUse"); fontEnd(); navCellEnd(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -91,7 +91,7 @@ protected void navLinkClass() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.Class"); + strongText("doclet.Class"); fontEnd(); navCellEnd(); } @@ -185,7 +185,7 @@ if (configuration().linksource) { printSrcLink(classDoc, name); } else { - bold(name); + strong(name); } if (!isInterface) { Type superclass = Util.getFirstVisibleSuperClass(classDoc, @@ -258,7 +258,7 @@ hr(); Tag[] deprs = classDoc.tags("deprecated"); if (Util.isDeprecated(classDoc)) { - boldText("doclet.Deprecated"); + strongText("doclet.Deprecated"); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags(); if (commentTags.length > 0) { @@ -307,9 +307,9 @@ classDoc, false)); if (configuration.shouldExcludeQualifier( classDoc.containingPackage().name())) { - bold(type.asClassDoc().name() + typeParameters); + strong(type.asClassDoc().name() + typeParameters); } else { - bold(type.asClassDoc().qualifiedName() + typeParameters); + strong(type.asClassDoc().qualifiedName() + typeParameters); } } else { print(getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_TREE_PARENT, @@ -359,7 +359,7 @@ if (subclasses.size() > 0) { dl(); dt(); - boldText("doclet.Subclasses"); + strongText("doclet.Subclasses"); writeClassLinks(LinkInfoImpl.CONTEXT_SUBCLASSES, subclasses); } @@ -375,7 +375,7 @@ if (subInterfaces.size() > 0) { dl(); dt(); - boldText("doclet.Subinterfaces"); + strongText("doclet.Subinterfaces"); writeClassLinks(LinkInfoImpl.CONTEXT_SUBINTERFACES, subInterfaces); } @@ -397,7 +397,7 @@ if (implcl.size() > 0) { dl(); dt(); - boldText("doclet.Implementing_Classes"); + strongText("doclet.Implementing_Classes"); writeClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_CLASSES, implcl); } @@ -413,7 +413,7 @@ if (classDoc.isClass() && interfaceArray.size() > 0) { dl(); dt(); - boldText("doclet.All_Implemented_Interfaces"); + strongText("doclet.All_Implemented_Interfaces"); writeClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_INTERFACES, interfaceArray); } @@ -429,7 +429,7 @@ if (classDoc.isInterface() && interfaceArray.size() > 0) { dl(); dt(); - boldText("doclet.All_Superinterfaces"); + strongText("doclet.All_Superinterfaces"); writeClassLinks(LinkInfoImpl.CONTEXT_SUPER_INTERFACES, interfaceArray); } @@ -570,9 +570,9 @@ dl(); dt(); if (outerClass.isInterface()) { - boldText("doclet.Enclosing_Interface"); + strongText("doclet.Enclosing_Interface"); } else { - boldText("doclet.Enclosing_Class"); + strongText("doclet.Enclosing_Class"); } dd(); printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS, outerClass, diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -92,7 +92,7 @@ * {@inheritDoc} */ public void writeContentsHeader() { - bold(configuration.getText("doclet.Contents")); + strong(configuration.getText("doclet.Contents")); ul(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -144,7 +144,7 @@ if (configuration().linksource) { writer.printSrcLink(constructor, constructor.name()); } else { - bold(constructor.name()); + strong(constructor.name()); } writeParameters(constructor); writeExceptions(constructor); @@ -220,7 +220,7 @@ } public void printSummaryLabel(ClassDoc cd) { - writer.boldText("doclet.Constructor_Summary"); + writer.strongText("doclet.Constructor_Summary"); } public void printSummaryAnchor(ClassDoc cd) { diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -111,7 +111,7 @@ throws IOException { writeHeader(); - bold(configuration.getText("doclet.Contents")); + strong(configuration.getText("doclet.Contents")); ul(); for (int i = 0; i < DeprecatedAPIListBuilder.NUM_TYPES; i++) { writeIndexLink(deprapi, i); @@ -156,7 +156,7 @@ hr(); center(); h2(); - boldText("doclet.Deprecated_API"); + strongText("doclet.Deprecated_API"); h2End(); centerEnd(); @@ -180,7 +180,7 @@ protected void navLinkDeprecated() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.navDeprecated"); + strongText("doclet.navDeprecated"); fontEnd(); navCellEnd(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -143,7 +143,7 @@ if (configuration().linksource) { writer.printSrcLink(enumConstant, enumConstant.name()); } else { - bold(enumConstant.name()); + strong(enumConstant.name()); } writer.preEnd(); writer.dl(); @@ -201,7 +201,7 @@ } public void printSummaryLabel(ClassDoc cd) { - writer.boldText("doclet.Enum_Constant_Summary"); + writer.strongText("doclet.Enum_Constant_Summary"); } public void printSummaryAnchor(ClassDoc cd) { @@ -216,9 +216,9 @@ } protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) { - writer.bold(); + writer.strong(); writer.printDocLink(context, (MemberDoc) member, member.name(), false); - writer.boldEnd(); + writer.strongEnd(); } protected void writeInheritedSummaryLink(ClassDoc cd, diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -153,7 +153,7 @@ if (configuration().linksource) { writer.printSrcLink(field, field.name()); } else { - bold(field.name()); + strong(field.name()); } writer.preEnd(); writer.dl(); @@ -190,7 +190,7 @@ holder.typeName() : holder.qualifiedTypeName(), false)); writer.dd(); - writer.bold(configuration().getText(holder.isClass()? + writer.strong(configuration().getText(holder.isClass()? "doclet.Description_From_Class" : "doclet.Description_From_Interface", classlink)); writer.ddEnd(); @@ -237,7 +237,7 @@ } public void printSummaryLabel(ClassDoc cd) { - writer.boldText("doclet.Field_Summary"); + writer.strongText("doclet.Field_Summary"); } public void printSummaryAnchor(ClassDoc cd) { @@ -251,18 +251,18 @@ public void printInheritedSummaryLabel(ClassDoc cd) { String classlink = writer.getPreQualifiedClassLink( LinkInfoImpl.CONTEXT_MEMBER, cd, false); - writer.bold(); + writer.strong(); String key = cd.isClass()? "doclet.Fields_Inherited_From_Class" : "doclet.Fields_Inherited_From_Interface"; writer.printText(key, classlink); - writer.boldEnd(); + writer.strongEnd(); } protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) { - writer.bold(); + writer.strong(); writer.printDocLink(context, cd , (MemberDoc) member, member.name(), false); - writer.boldEnd(); + writer.strongEnd(); } protected void writeInheritedSummaryLink(ClassDoc cd, diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -223,7 +223,7 @@ protected void navLinkHelp() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.Help"); + strongText("doclet.Help"); fontEnd(); navCellEnd(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -183,21 +183,21 @@ * @param where Position in the file * @param target Name of the target frame. * @param label Tag for the link. - * @param bold Whether the label should be bold or not? + * @param strong Whether the label should be strong or not? */ public void printNoFramesTargetHyperLink(String link, String where, String target, String label, - boolean bold) { + boolean strong) { script(); println(" "); scriptEnd(); noScript(); - println(" " + getHyperLink(link, where, label, bold, "", "", target)); + println(" " + getHyperLink(link, where, label, strong, "", "", target)); noScriptEnd(); println(DocletConstants.NL); } @@ -958,10 +958,10 @@ * * @param pkg the package to link to. * @param label the label for the link. - * @param isBold true if the label should be bold. + * @param isStrong true if the label should be strong. */ - public void printPackageLink(PackageDoc pkg, String label, boolean isBold) { - print(getPackageLink(pkg, label, isBold)); + public void printPackageLink(PackageDoc pkg, String label, boolean isStrong) { + print(getPackageLink(pkg, label, isStrong)); } /** @@ -969,12 +969,12 @@ * * @param pkg the package to link to. * @param label the label for the link. - * @param isBold true if the label should be bold. + * @param isStrong true if the label should be strong. * @param style the font of the package link label. */ - public void printPackageLink(PackageDoc pkg, String label, boolean isBold, + public void printPackageLink(PackageDoc pkg, String label, boolean isStrong, String style) { - print(getPackageLink(pkg, label, isBold, style)); + print(getPackageLink(pkg, label, isStrong, style)); } /** @@ -982,12 +982,12 @@ * * @param pkg the package to link to. * @param label the label for the link. - * @param isBold true if the label should be bold. + * @param isStrong true if the label should be strong. * @return the link to the given package. */ public String getPackageLink(PackageDoc pkg, String label, - boolean isBold) { - return getPackageLink(pkg, label, isBold, ""); + boolean isStrong) { + return getPackageLink(pkg, label, isStrong, ""); } /** @@ -995,11 +995,11 @@ * * @param pkg the package to link to. * @param label the label for the link. - * @param isBold true if the label should be bold. + * @param isStrong true if the label should be strong. * @param style the font of the package link label. * @return the link to the given package. */ - public String getPackageLink(PackageDoc pkg, String label, boolean isBold, + public String getPackageLink(PackageDoc pkg, String label, boolean isStrong, String style) { boolean included = pkg != null && pkg.isIncluded(); if (! included) { @@ -1013,11 +1013,11 @@ } if (included || pkg == null) { return getHyperLink(pathString(pkg, "package-summary.html"), - "", label, isBold, style); + "", label, isStrong, style); } else { String crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg)); if (crossPkgLink != null) { - return getHyperLink(crossPkgLink, "", label, isBold, style); + return getHyperLink(crossPkgLink, "", label, isStrong, style); } else { return label; } @@ -1087,12 +1087,12 @@ * @param refMemName the name of the member being referenced. This should * be null or empty string if no member is being referenced. * @param label the label for the external link. - * @param bold true if the link should be bold. + * @param strong true if the link should be strong. * @param style the style of the link. * @param code true if the label should be code font. */ public String getCrossClassLink(String qualifiedClassName, String refMemName, - String label, boolean bold, String style, + String label, boolean strong, String style, boolean code) { String className = "", packageName = qualifiedClassName == null ? "" : qualifiedClassName; @@ -1113,7 +1113,7 @@ className + ".html?is-external=true"), refMemName == null ? "" : refMemName, label == null || label.length() == 0 ? defaultLabel : label, - bold, style, + strong, style, configuration.getText("doclet.Href_Class_Or_Interface_Title", packageName), ""); } @@ -1152,26 +1152,26 @@ * link label. * * @param cd the class to link to. - * @param isBold true if the link should be bold. + * @param isStrong true if the link should be strong. * @return the link with the package portion of the label in plain text. */ public String getPreQualifiedClassLink(int context, - ClassDoc cd, boolean isBold) { + ClassDoc cd, boolean isStrong) { String classlink = ""; PackageDoc pd = cd.containingPackage(); if(pd != null && ! configuration.shouldExcludeQualifier(pd.name())) { classlink = getPkgName(cd); } - classlink += getLink(new LinkInfoImpl(context, cd, cd.name(), isBold)); + classlink += getLink(new LinkInfoImpl(context, cd, cd.name(), isStrong)); return classlink; } /** - * Print Class link, with only class name as the bold link and prefixing + * Print Class link, with only class name as the strong link and prefixing * plain package name. */ - public void printPreQualifiedBoldClassLink(int context, ClassDoc cd) { + public void printPreQualifiedStrongClassLink(int context, ClassDoc cd) { print(getPreQualifiedClassLink(context, cd, true)); } @@ -1187,16 +1187,16 @@ print(configuration.getText(key, a1, a2)); } - public void boldText(String key) { - bold(configuration.getText(key)); + public void strongText(String key) { + strong(configuration.getText(key)); } - public void boldText(String key, String a1) { - bold(configuration.getText(key, a1)); + public void strongText(String key, String a1) { + strong(configuration.getText(key, a1)); } - public void boldText(String key, String a1, String a2) { - bold(configuration.getText(key, a1, a2)); + public void strongText(String key, String a1, String a2) { + strong(configuration.getText(key, a1, a2)); } /** @@ -1205,11 +1205,11 @@ * @param context the id of the context where the link will be printed. * @param doc the member being linked to. * @param label the label for the link. - * @param bold true if the link should be bold. + * @param strong true if the link should be strong. */ public void printDocLink(int context, MemberDoc doc, String label, - boolean bold) { - print(getDocLink(context, doc, label, bold)); + boolean strong) { + print(getDocLink(context, doc, label, strong)); } /** @@ -1221,11 +1221,11 @@ * inheriting comments. * @param doc the member being linked to. * @param label the label for the link. - * @param bold true if the link should be bold. + * @param strong true if the link should be strong. */ public void printDocLink(int context, ClassDoc classDoc, MemberDoc doc, - String label, boolean bold) { - print(getDocLink(context, classDoc, doc, label, bold)); + String label, boolean strong) { + print(getDocLink(context, classDoc, doc, label, strong)); } /** @@ -1234,12 +1234,12 @@ * @param context the id of the context where the link will be printed. * @param doc the member being linked to. * @param label the label for the link. - * @param bold true if the link should be bold. + * @param strong true if the link should be strong. * @return the link for the given member. */ public String getDocLink(int context, MemberDoc doc, String label, - boolean bold) { - return getDocLink(context, doc.containingClass(), doc, label, bold); + boolean strong) { + return getDocLink(context, doc.containingClass(), doc, label, strong); } /** @@ -1251,21 +1251,21 @@ * inheriting comments. * @param doc the member being linked to. * @param label the label for the link. - * @param bold true if the link should be bold. + * @param strong true if the link should be strong. * @return the link for the given member. */ public String getDocLink(int context, ClassDoc classDoc, MemberDoc doc, - String label, boolean bold) { + String label, boolean strong) { if (! (doc.isIncluded() || Util.isLinkable(classDoc, configuration()))) { return label; } else if (doc instanceof ExecutableMemberDoc) { ExecutableMemberDoc emd = (ExecutableMemberDoc)doc; return getLink(new LinkInfoImpl(context, classDoc, - getAnchor(emd), label, bold)); + getAnchor(emd), label, strong)); } else if (doc instanceof MemberDoc) { return getLink(new LinkInfoImpl(context, classDoc, - doc.name(), label, bold)); + doc.name(), label, strong)); } else { return label; } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -100,7 +100,7 @@ fieldType)); } print(fieldDimensions + ' '); - bold(fieldName); + strong(fieldName); writer.preEnd(); writer.dl(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -81,7 +81,7 @@ !(linkInfo.classDoc.name() + ".html").equals(m_writer.filename)) { linkOutput.append(m_writer.getHyperLink(filename, classLinkInfo.where, label.toString(), - classLinkInfo.isBold, classLinkInfo.styleName, + classLinkInfo.isStrong, classLinkInfo.styleName, title, classLinkInfo.target)); if (noLabel && !classLinkInfo.excludeTypeParameterLinks) { linkOutput.append(getTypeParameterLinks(linkInfo).toString()); @@ -92,7 +92,7 @@ } else { String crossLink = m_writer.getCrossClassLink( classDoc.qualifiedName(), classLinkInfo.where, - label.toString(), classLinkInfo.isBold, classLinkInfo.styleName, + label.toString(), classLinkInfo.isStrong, classLinkInfo.styleName, true); if (crossLink != null) { linkOutput.append(crossLink); diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -235,15 +235,15 @@ * @param classDoc the class to link to. * @param where the value of the marker #. * @param label the label for the link. - * @param isBold true if the link should be bold. + * @param isStrong true if the link should be strong. * @param styleName String style of text defined in style sheet. */ public LinkInfoImpl (int context, ClassDoc classDoc, String where, String label, - boolean isBold, String styleName){ + boolean isStrong, String styleName){ this.classDoc = classDoc; this.where = where; this.label = label; - this.isBold = isBold; + this.isStrong = isStrong; this.styleName = styleName; setContext(context); } @@ -255,14 +255,14 @@ * @param classDoc the class to link to. * @param where the value of the marker #. * @param label the label for the link. - * @param isBold true if the link should be bold. + * @param isStrong true if the link should be strong. */ public LinkInfoImpl (int context, ClassDoc classDoc, String where, String label, - boolean isBold){ + boolean isStrong){ this.classDoc = classDoc; this.where = where; this.label = label; - this.isBold = isBold; + this.isStrong = isStrong; setContext(context); } @@ -283,12 +283,12 @@ * * @param context the context of the link. * @param executableMemberDoc the member to link to. - * @param isBold true if the link should be bold. + * @param isStrong true if the link should be strong. */ public LinkInfoImpl (int context, ExecutableMemberDoc executableMemberDoc, - boolean isBold){ + boolean isStrong){ this.executableMemberDoc = executableMemberDoc; - this.isBold = isBold; + this.isStrong = isStrong; setContext(context); } @@ -297,11 +297,11 @@ * * @param context the context of the link. * @param classDoc the class to link to. - * @param isBold true if the link should be bold. + * @param isStrong true if the link should be strong. */ - public LinkInfoImpl (int context, ClassDoc classDoc, boolean isBold){ + public LinkInfoImpl (int context, ClassDoc classDoc, boolean isStrong){ this.classDoc = classDoc; - this.isBold = isBold; + this.isStrong = isStrong; setContext(context); } @@ -335,13 +335,13 @@ * @param context the context of the link. * @param type the class to link to. * @param label the label for the link. - * @param isBold true if the link should be bold. + * @param isStrong true if the link should be strong. */ public LinkInfoImpl (int context, Type type, String label, - boolean isBold){ + boolean isStrong){ this.type = type; this.label = label; - this.isBold = isBold; + this.isStrong = isStrong; setContext(context); } @@ -351,13 +351,13 @@ * @param context the context of the link. * @param classDoc the class to link to. * @param label the label for the link. - * @param isBold true if the link should be bold. + * @param isStrong true if the link should be strong. */ public LinkInfoImpl (int context, ClassDoc classDoc, String label, - boolean isBold){ + boolean isStrong){ this.classDoc = classDoc; this.label = label; - this.isBold = isBold; + this.isStrong = isStrong; setContext(context); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -167,7 +167,7 @@ if (configuration().linksource) { writer.printSrcLink(method, method.name()); } else { - bold(method.name()); + strong(method.name()); } writeParameters(method); writeExceptions(method); @@ -210,7 +210,7 @@ holder.typeName() : holder.qualifiedTypeName(), false)); writer.dd(); - writer.boldText(holder.asClassDoc().isClass()? + writer.strongText(holder.asClassDoc().isClass()? "doclet.Description_From_Class": "doclet.Description_From_Interface", classlink); @@ -259,7 +259,7 @@ } public void printSummaryLabel(ClassDoc cd) { - writer.boldText("doclet.Method_Summary"); + writer.strongText("doclet.Method_Summary"); } public void printSummaryAnchor(ClassDoc cd) { @@ -274,12 +274,12 @@ public void printInheritedSummaryLabel(ClassDoc cd) { String classlink = writer.getPreQualifiedClassLink( LinkInfoImpl.CONTEXT_MEMBER, cd, false); - writer.bold(); + writer.strong(); String key = cd.isClass()? "doclet.Methods_Inherited_From_Class" : "doclet.Methods_Inherited_From_Interface"; writer.printText(key, classlink); - writer.boldEnd(); + writer.strongEnd(); } protected void printSummaryType(ProgramElementDoc member) { @@ -317,7 +317,7 @@ writer.getLink(new LinkInfoImpl(context, overriddenType))); String name = method.name(); writer.dt(); - writer.boldText(label); + writer.strongText(label); writer.dd(); String methLink = writer.codeText( writer.getLink( @@ -363,7 +363,7 @@ writer.getLink(new LinkInfoImpl( LinkInfoImpl.CONTEXT_METHOD_SPECIFIED_BY, intfac))); writer.dt(); - writer.boldText("doclet.Specified_By"); + writer.strongText("doclet.Specified_By"); writer.dd(); methlink = writer.codeText(writer.getDocLink( LinkInfoImpl.CONTEXT_MEMBER, implementedMeth, diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -149,7 +149,7 @@ } public void printSummaryLabel(ClassDoc cd) { - writer.boldText("doclet.Nested_Class_Summary"); + writer.strongText("doclet.Nested_Class_Summary"); } public void printSummaryAnchor(ClassDoc cd) { @@ -164,18 +164,18 @@ public void printInheritedSummaryLabel(ClassDoc cd) { String clslink = writer.getPreQualifiedClassLink( LinkInfoImpl.CONTEXT_MEMBER, cd, false); - writer.bold(); + writer.strong(); writer.printText(cd.isInterface() ? "doclet.Nested_Classes_Interface_Inherited_From_Interface" : "doclet.Nested_Classes_Interfaces_Inherited_From_Class", clslink); - writer.boldEnd(); + writer.strongEnd(); } protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) { - writer.bold(); + writer.strong(); writer.printLink(new LinkInfoImpl(context, (ClassDoc)member, false)); - writer.boldEnd(); + writer.strongEnd(); } protected void writeInheritedSummaryLink(ClassDoc cd, diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -87,7 +87,7 @@ } /** - * Print the "-packagesheader" string in bold format, at top of the page, + * Print the "-packagesheader" string in strong format, at top of the page, * if it is not the empty string. Otherwise print the "-header" string. * Despite the name, there is actually no navigation bar for this page. */ @@ -95,9 +95,9 @@ printTableHeader(true); fontSizeStyle("+1", "FrameTitleFont"); if (configuration.packagesheader.length() > 0) { - bold(replaceDocRootDir(configuration.packagesheader)); + strong(replaceDocRootDir(configuration.packagesheader)); } else { - bold(replaceDocRootDir(configuration.header)); + strong(replaceDocRootDir(configuration.header)); } fontEnd(); printTableFooter(true); diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -102,9 +102,9 @@ if(pkg != null && pkg.name().length() > 0) { trBgcolorStyle("white", "TableRowColor"); summaryRow(20); - bold(); + strong(); printPackageLink(pkg, Util.getPackageName(pkg), false); - boldEnd(); + strongEnd(); summaryRowEnd(); summaryRow(0); printSummaryComment(pkg); @@ -137,7 +137,7 @@ if (root.inlineTags().length > 0) { printSummaryComment(root); p(); - bold(configuration.getText("doclet.See")); + strong(configuration.getText("doclet.See")); br(); printNbsps(); printHyperLink("", "overview_description", @@ -152,7 +152,7 @@ protected void printIndexHeader(String text) { tableIndexSummary(); tableHeaderStart("#CCCCFF"); - bold(text); + strong(text); tableHeaderEnd(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -144,7 +144,7 @@ protected void printLinkToMainTree() { dl(); dt(); - boldText("doclet.Package_Hierarchies"); + strongText("doclet.Package_Hierarchies"); dd(); navLinkMainTree(configuration.getText("doclet.All_Packages")); dlEnd(); diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -178,9 +178,9 @@ trBgcolorStyle("white", "TableRowColor"); summaryRow(0); - bold(); + strong(); printHyperLink(path, packageName, usedClass.name(), true); - boldEnd(); + strongEnd(); println(); br(); printNbsps(); printIndexComment(usedClass); @@ -219,7 +219,7 @@ hr(); center(); h2(); - boldText("doclet.ClassUse_Title", packageLabel, name); + strongText("doclet.ClassUse_Title", packageLabel, name); h2End(); centerEnd(); } @@ -251,7 +251,7 @@ protected void navLinkClassUse() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.navClassUse"); + strongText("doclet.navClassUse"); fontEnd(); navCellEnd(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -123,14 +123,14 @@ } trBgcolorStyle("white", "TableRowColor"); summaryRow(15); - bold(); + strong(); printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_PACKAGE, classes[i], false)); - boldEnd(); + strongEnd(); summaryRowEnd(); summaryRow(0); if (Util.isDeprecated(classes[i])) { - boldText("doclet.Deprecated"); + strongText("doclet.Deprecated"); if (classes[i].tags("deprecated").length > 0) { space(); printSummaryDeprecatedComment(classes[i], @@ -155,7 +155,7 @@ */ protected void printFirstRow(String label) { tableHeaderStart("#CCCCFF"); - bold(label); + strong(label); tableHeaderEnd(); } @@ -194,7 +194,7 @@ if (packageDoc.inlineTags().length > 0 && ! configuration.nocomment) { printSummaryComment(packageDoc); p(); - bold(configuration.getText("doclet.See")); + strong(configuration.getText("doclet.See")); br(); printNbsps(); printHyperLink("", "package_description", @@ -268,7 +268,7 @@ protected void navLinkPackage() { navCellRevStart(); fontStyle("NavBarFont1Rev"); - boldText("doclet.Package"); + strongText("doclet.Package"); fontEnd(); navCellEnd(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -73,9 +73,9 @@ tableHeader(); thAlign("center"); font("+2"); - boldText("doclet.Package"); + strongText("doclet.Package"); print(' '); - bold(packageName); + strong(packageName); tableFooter(); } @@ -86,7 +86,7 @@ * @param serialUID the serial UID to print. */ public void writeSerialUIDInfo(String header, String serialUID) { - bold(header + " "); + strong(header + " "); println(serialUID); p(); } @@ -131,7 +131,7 @@ tableHeader(); thAlignColspan("left", 2); font("+2"); - bold(className); + strong(className); tableFooter(); p(); } diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Thu Jan 08 16:26:59 2009 -0800 @@ -81,7 +81,7 @@ public void printTableHeadingBackground(String str) { tableIndexDetail(); tableHeaderStart("#CCCCFF", 1); - bold(str); + strong(str); tableHeaderEnd(); tableEnd(); } @@ -117,7 +117,7 @@ protected void printIndexComment(Doc member, Tag[] firstSentenceTags) { Tag[] deprs = member.tags("deprecated"); if (Util.isDeprecated((ProgramElementDoc) member)) { - boldText("doclet.Deprecated"); + strongText("doclet.Deprecated"); space(); if (deprs.length > 0) { printInlineDeprecatedComment(member, deprs[0]); @@ -126,7 +126,7 @@ } else { ClassDoc cd = ((ProgramElementDoc)member).containingClass(); if (cd != null && Util.isDeprecated(cd)) { - boldText("doclet.Deprecated"); space(); + strongText("doclet.Deprecated"); space(); } } printSummaryComment(member, firstSentenceTags); diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Fri Dec 05 21:59:59 2008 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Thu Jan 08 16:26:59 2009 -0800 @@ -69,9 +69,9 @@ Tag[] deprs = doc.tags("deprecated"); if (doc instanceof ClassDoc) { if (Util.isDeprecated((ProgramElementDoc) doc)) { - output.append("" + + output.append("" + ConfigurationImpl.getInstance(). - getText("doclet.Deprecated") + " "); + getText("doclet.Deprecated") + " "); if (deprs.length > 0) { Tag[] commentTags = deprs[0].inlineTags(); if (commentTags.length > 0) { @@ -86,9 +86,9 @@ } else { MemberDoc member = (MemberDoc) doc; if (Util.isDeprecated((ProgramElementDoc) doc)) { - output.append("
Link to external member gcd
"},
{BUG_ID + FS + "C.html",
- "Overrides:toString
in class java.lang.Object
"}
+ "Overrides:toString
in class java.lang.Object
"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS =
diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java
--- a/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Dec 05 21:59:59 2008 -0800
+++ b/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java Thu Jan 08 16:26:59 2009 -0800
@@ -49,12 +49,12 @@
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "package-tree.html",
""+NL+"
i
- a param."+NL+"
i
- a param." + NL + "
@Deprecated" + NL + - "public class DeprecatedClassByAnnotation"}, + "public class DeprecatedClassByAnnotation"}, - {TARGET_FILE2, "public int field" + NL + + {TARGET_FILE2, "public int field" + NL + "
Overrides:read
in class " +
"FilterReader"},
{BUG_ID + FS + "pkg" + FS + "XReader.html",
- "Specified by:Specified by:readInt
in interface " +
"" + NL +
- "Class Summary"
+ "Class Summary"
},
// Class documentation
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"" + NL +
- "Field Summary "
+ "Field Summary"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
- "Methods inherited from class " + "java.lang.Object "
+ "Methods inherited from class " + "java.lang.Object "
},
// Class use documentation
@@ -76,7 +76,7 @@
// Deprecated
{BUG_ID + FS + "deprecated-list.html",
"" + NL +
- "Deprecated Methods "
+ "Deprecated Methods"
},
// Constant values
@@ -90,20 +90,20 @@
// Serialized Form
{BUG_ID + FS + "serialized-form.html",
"" + NL +
- "Package pkg1 "
+ "Package pkg1"
},
{BUG_ID + FS + "serialized-form.html",
"" + NL +
- "Class pkg1.C1 extends java.lang.Object " + "implements Serializable "
+ "Class pkg1.C1 extends java.lang.Object " + "implements Serializable"
},
{BUG_ID + FS + "serialized-form.html",
"" + NL +
- "Serialized Fields "
+ "Serialized Fields"
},
// Overview Frame
{BUG_ID + FS + "overview-frame.html",
- "" + NL + "Test Files "
+ "" + NL + "Test Files "
},
{BUG_ID + FS + "overview-frame.html",
"" + NL +
diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Fri Dec 05 21:59:59 2008 -0800
+++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Thu Jan 08 16:26:59 2009 -0800
@@ -91,7 +91,8 @@
private static final String[][] TEST2 = {
{BUG_ID + FS + "TestHelpOption.html",
- "" +
"Help"
+ "" +
+ "Help"
},
};
private static final String[][] NEGATED_TEST2 = NO_TEST;
diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testHref/TestHref.java
--- a/langtools/test/com/sun/javadoc/testHref/TestHref.java Fri Dec 05 21:59:59 2008 -0800
+++ b/langtools/test/com/sun/javadoc/testHref/TestHref.java Thu Jan 08 16:26:59 2009 -0800
@@ -67,7 +67,7 @@
},
//@see test.
{BUG_ID + FS + "pkg" + FS + "C2.html",
- "See Also:- "
+ "See Also:
- "
},
//Header does not link to the page itself.
@@ -77,7 +77,7 @@
//Signature does not link to the page itself.
{BUG_ID + FS + "pkg" + FS + "C4.html",
- "public abstract class C4<E extends C4<E>>"
+ "public abstract class C4<E extends C4<E>>"
},
};
private static final String[][] NEGATED_TEST =
diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Thu Jan 08 16:26:59 2009 -0800
@@ -0,0 +1,82 @@
+/*
+ * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6786028
+ * @summary This test verifys the use of HTML tag instead of by Javadoc std doclet.
+ * @author Bhavesh Patel
+ * @library ../lib/
+ * @build JavadocTester
+ * @build TestHtmlStrongTag
+ * @run main TestHtmlStrongTag
+ */
+
+public class TestHtmlStrongTag extends JavadocTester {
+
+ private static final String BUG_ID = "6786028";
+ private static final String[][] TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "Method Summary"},
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "See Also:"},
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "Class Summary"}};
+ private static final String[][] NEGATED_TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", ""}};
+ private static final String[][] TEST2 = {
+ {BUG_ID + FS + "pkg2" + FS + "C2.html", "Method Summary"},
+ {BUG_ID + FS + "pkg2" + FS + "C2.html", "Comments:"},
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "Class Summary"}};
+
+ private static final String[] ARGS1 =
+ new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
+ private static final String[] ARGS2 =
+ new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg2"};
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestHtmlStrongTag tester = new TestHtmlStrongTag();
+ run(tester, ARGS1, TEST1, NEGATED_TEST1);
+ run(tester, ARGS2, TEST2, NO_TEST);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java Thu Jan 08 16:26:59 2009 -0800
@@ -0,0 +1,36 @@
+/*
+ * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package pkg1;
+
+/**
+ * @see java.lang.Object#wait(long, int)
+ */
+public class C1 {
+
+ public void method(int param1, int param2) {
+
+ }
+}
diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java Thu Jan 08 16:26:59 2009 -0800
@@ -0,0 +1,31 @@
+/*
+ * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package pkg2;
+
+/**
+ * Comments: Class 2
+ */
+public class C2 {}
diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testIndex/TestIndex.java
--- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Fri Dec 05 21:59:59 2008 -0800
+++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Thu Jan 08 16:26:59 2009 -0800
@@ -54,27 +54,27 @@
//Test index-all.html
{BUG_ID + FS + "index-all.html",
- "C" +
+ "C" +
" - Class in pkg"},
{BUG_ID + FS + "index-all.html",
"" +
- "Interface - Interface in " +
+ "Interface - Interface in " +
"pkg"},
{BUG_ID + FS + "index-all.html",
"" +
- "AnnotationType - Annotation Type in " +
+ "AnnotationType
- Annotation Type in " +
"pkg"},
{BUG_ID + FS + "index-all.html",
"" +
- "Coin - Enum in " +
+ "Coin
- Enum in " +
"pkg"},
{BUG_ID + FS + "index-all.html",
"Class in <Unnamed>"},
{BUG_ID + FS + "index-all.html",
- "- Java - " + NL +
+ "
- Java - " + NL +
"Static variable in class pkg.C" + NL +
"
- " + NL +
- "
- JDK - " + NL +
+ "
- JDK - " + NL +
"Static variable in class pkg.C" + NL +
"
- "},
};
diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testInterface/TestInterface.java
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Fri Dec 05 21:59:59 2008 -0800
+++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Thu Jan 08 16:26:59 2009 -0800
@@ -48,14 +48,14 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "int method()"},
+ "int method()"},
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "static final int field"},
+ "static final int field"},
// Make sure known implementing class list is correct and omits type parameters.
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "
- All Known Implementing Classes: " +
+ "
- All Known Implementing Classes: " +
"
- Child, " +
"" +
@@ -63,34 +63,34 @@
// Make sure "All Implemented Interfaces": has substituted type parameters
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "All Implemented Interfaces:
- Interface<T>"
+ "All Implemented Interfaces:
- Interface<T>"
},
//Make sure Class Tree has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
"
" + NL +
"java.lang.Object" + NL +
" pkg.Parent<T>" + NL +
- " pkg.Child<T>" + NL +
+ " pkg.Child<T>" + NL +
"
"
},
//Make sure "Direct Know Subclasses" omits type parameters
{BUG_ID + FS + "pkg" + FS + "Parent.html",
- "Direct Known Subclasses: - Child"
+ "Direct Known Subclasses:
- Child"
},
//Make sure "Specified By" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "Specified by:
method
in interface Interface<T>
"
+ "Specified by:method
in interface Interface<T>
"
},
//Make sure "Overrides" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "Overrides:method
in class Parent<T>
"
+ "Overrides:method
in class Parent<T>
"
},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "public int method()"},
+ "public int method()"},
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "public static final int field"},
+ "public static final int field"},
};
/**
diff -r d4c11dcedac3 -r 1aa079321cd2 langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
--- a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Fri Dec 05 21:59:59 2008 -0800
+++ b/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Thu Jan 08 16:26:59 2009 -0800
@@ -45,9 +45,9 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "C.html",
- "FRAMES"},
+ "FRAMES"},
{BUG_ID + FS + "TestJavascript.html",
- "FRAMES"},
+ "FRAMES"},
{BUG_ID + FS + "index.html",
"