/hg/icedtea6-hg: Remove upstreamed langtools patches from the 20...

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Thu Aug 8 07:24:29 PDT 2013


changeset 2a39fbf2cf14 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2a39fbf2cf14
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 08 15:24:00 2013 +0100

	Remove upstreamed langtools patches from the 2013/06/18 erratum.

	2013-08-07  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/openjdk/6786028-wcag_bold_tags.patch,
		* patches/openjdk/6786682-wcag_lang.patch,
		* patches/openjdk/6786688-wcag_table.patch,
		* patches/openjdk/6786690-wcag_dl.patch,
		* patches/openjdk/6802694-no_deprecated.patch,
		* patches/openjdk/6851834-handle_renames.patch,
		* patches/openjdk/6851834-restructure.patch,
		* patches/openjdk/6961178-doclet_xml.patch,
		* patches/openjdk/7006270-regressions.patch,
		* patches/security/20130618/8012375-javadoc_framing.patch,
		* patches/security/20130618/8015997-more_javadoc_framing.patch,
		* patches/security/20130618/langtools_generics.patch,
		* patches/security/20130618/langtools_merge-01.patch,
		* patches/security/20130618/langtools_merge-02.patch,
		* patches/security/20130618/langtools_merge-03.patch:
		Removed.
		* Makefile.am:
		(ICEDTEA_PATCHES): Remove upstreamed patches.


diffstat:

 ChangeLog                                                    |     21 +
 Makefile.am                                                  |     17 +-
 patches/openjdk/6786028-wcag_bold_tags.patch                 |   2914 -
 patches/openjdk/6786682-wcag_lang.patch                      |    274 -
 patches/openjdk/6786688-wcag_table.patch                     |   2828 -
 patches/openjdk/6786690-wcag_dl.patch                        |   3230 -
 patches/openjdk/6802694-no_deprecated.patch                  |    601 -
 patches/openjdk/6851834-handle_renames.patch                 |    605 -
 patches/openjdk/6851834-restructure.patch                    |  26853 ----------
 patches/openjdk/6961178-doclet_xml.patch                     |   1989 -
 patches/openjdk/7006270-regressions.patch                    |    299 -
 patches/security/20130618/8012375-javadoc_framing.patch      |     61 -
 patches/security/20130618/8015997-more_javadoc_framing.patch |     21 -
 patches/security/20130618/langtools_generics.patch           |    600 -
 patches/security/20130618/langtools_merge-01.patch           |     30 -
 patches/security/20130618/langtools_merge-02.patch           |     30 -
 patches/security/20130618/langtools_merge-03.patch           |     18 -
 17 files changed, 22 insertions(+), 40369 deletions(-)

diffs (truncated from 40479 to 500 lines):

diff -r 55b0d105e57a -r 2a39fbf2cf14 ChangeLog
--- a/ChangeLog	Wed Aug 07 13:07:02 2013 +0100
+++ b/ChangeLog	Thu Aug 08 15:24:00 2013 +0100
@@ -1,3 +1,24 @@
+2013-08-07  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/openjdk/6786028-wcag_bold_tags.patch,
+	* patches/openjdk/6786682-wcag_lang.patch,
+	* patches/openjdk/6786688-wcag_table.patch,
+	* patches/openjdk/6786690-wcag_dl.patch,
+	* patches/openjdk/6802694-no_deprecated.patch,
+	* patches/openjdk/6851834-handle_renames.patch,
+	* patches/openjdk/6851834-restructure.patch,
+	* patches/openjdk/6961178-doclet_xml.patch,
+	* patches/openjdk/7006270-regressions.patch,
+	* patches/security/20130618/8012375-javadoc_framing.patch,
+	* patches/security/20130618/8015997-more_javadoc_framing.patch,
+	* patches/security/20130618/langtools_generics.patch,
+	* patches/security/20130618/langtools_merge-01.patch,
+	* patches/security/20130618/langtools_merge-02.patch,
+	* patches/security/20130618/langtools_merge-03.patch:
+	Removed.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove upstreamed patches.
+
 2013-08-07  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* hotspot.map: Bring in 2.3.12 tag.
diff -r 55b0d105e57a -r 2a39fbf2cf14 Makefile.am
--- a/Makefile.am	Wed Aug 07 13:07:02 2013 +0100
+++ b/Makefile.am	Thu Aug 08 15:24:00 2013 +0100
@@ -282,22 +282,7 @@
 
 SECURITY_PATCHES = \
 	patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
-	patches/security/20130618/handle_npe.patch \
-	patches/openjdk/6786028-wcag_bold_tags.patch \
-	patches/openjdk/6786682-wcag_lang.patch \
-	patches/openjdk/6802694-no_deprecated.patch \
-	patches/openjdk/6786690-wcag_dl.patch \
-	patches/openjdk/6786688-wcag_table.patch \
-	patches/openjdk/6961178-doclet_xml.patch \
-	patches/openjdk/6851834-restructure.patch \
-	patches/openjdk/6851834-handle_renames.patch \
-	patches/openjdk/7006270-regressions.patch \
-	patches/security/20130618/8012375-javadoc_framing.patch \
-	patches/security/20130618/8015997-more_javadoc_framing.patch \
-	patches/security/20130618/langtools_merge-01.patch \
-	patches/security/20130618/langtools_merge-02.patch \
-	patches/security/20130618/langtools_generics.patch \
-	patches/security/20130618/langtools_merge-03.patch
+	patches/security/20130618/handle_npe.patch
 
 if !WITH_ALT_HSBUILD
 SECURITY_PATCHES += \
diff -r 55b0d105e57a -r 2a39fbf2cf14 patches/openjdk/6786028-wcag_bold_tags.patch
--- a/patches/openjdk/6786028-wcag_bold_tags.patch	Wed Aug 07 13:07:02 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2914 +0,0 @@
-# HG changeset patch
-# User bpatel
-# Date 1231460819 28800
-# Node ID a50f3556d6954decf0897aa984c8ba43def77b9e
-# Parent  4ab5d66aaf2b9e5c09ab54748f6e2615b7818b12
-6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong
-Reviewed-by: jjg
-
-diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
-@@ -160,7 +160,7 @@
-      */
-     protected void printAllClassesTableHeader() {
-         fontSizeStyle("+1", "FrameHeadingFont");
--        boldText("doclet.All_Classes");
-+        strongText("doclet.All_Classes");
-         fontEnd();
-         br();
-         table();
-diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
-@@ -92,7 +92,7 @@
-      * {@inheritDoc}
-      */
-     public void writeContentsHeader() {
--        bold(configuration.getText("doclet.Contents"));
-+        strong(configuration.getText("doclet.Contents"));
-         ul();
-     }
- 
-diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
---- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
-+++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
-@@ -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 --git a/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java



More information about the distro-pkg-dev mailing list