From ed209e2a4834214c83a3b60c1b2155581e991de4 Mon Sep 17 00:00:00 2001 From: Bhavesh Patel Date: Wed, 21 Sep 2016 18:18:50 -0700 Subject: [PATCH] 8162363: Tables in javadoc documentation missing row headers Reviewed-by: jjg --- .../formats/html/AbstractMemberWriter.java | 45 +++++++----- .../html/AnnotationTypeFieldWriterImpl.java | 6 +- ...nnotationTypeOptionalMemberWriterImpl.java | 5 +- ...nnotationTypeRequiredMemberWriterImpl.java | 5 +- .../doclets/formats/html/ClassUseWriter.java | 8 +-- .../html/ConstantsSummaryWriterImpl.java | 3 +- .../formats/html/ConstructorWriterImpl.java | 19 ++--- .../formats/html/DeprecatedListWriter.java | 13 ++-- .../formats/html/EnumConstantWriterImpl.java | 14 ++-- .../doclets/formats/html/FieldWriterImpl.java | 5 +- .../formats/html/HtmlDocletWriter.java | 23 ++++--- .../formats/html/MethodWriterImpl.java | 4 +- .../formats/html/ModuleIndexWriter.java | 4 +- .../formats/html/ModuleWriterImpl.java | 38 +++++----- .../formats/html/NestedClassWriterImpl.java | 10 +-- .../formats/html/PackageIndexWriter.java | 4 +- .../formats/html/PackageUseWriter.java | 17 ++--- .../formats/html/PackageWriterImpl.java | 4 +- .../formats/html/PropertyWriterImpl.java | 8 +-- .../formats/html/markup/HtmlStyle.java | 1 - .../doclets/formats/html/markup/HtmlTree.java | 11 +++ .../doclets/toolkit/resources/stylesheet.css | 24 ++++--- .../TestConstantValuesDriver.java | 28 ++++---- .../TestAnnotationTypes.java | 6 +- .../doclet/testHeadings/TestHeadings.java | 13 ++-- .../testHtmlTableTags/TestHtmlTableTags.java | 52 +++++++++----- .../javadoc/doclet/testJavaFX/TestJavaFX.java | 46 ++++++------- .../TestMemberInheritence.java | 6 +- .../testMemberSummary/TestMemberSummary.java | 4 +- .../doclet/testModules/TestModules.java | 22 +++--- .../TestNewLanguageFeatures.java | 69 +++++++++---------- .../TestPackageDeprecation.java | 4 +- .../doclet/testStylesheet/TestStylesheet.java | 5 +- .../TestTypeAnnotations.java | 28 ++++---- .../doclet/testUseOption/TestUseOption.java | 16 ++--- 35 files changed, 296 insertions(+), 274 deletions(-) diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java index 595d5b45af9..d783fd35f05 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java @@ -424,12 +424,15 @@ public abstract class AbstractMemberWriter { Content tbody = new HtmlTree(HtmlTag.TBODY); boolean altColor = true; for (Element member : deprmembers) { - HtmlTree td = HtmlTree.TD(HtmlStyle.colOne, getDeprecatedLink(member)); + HtmlTree thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, getDeprecatedLink(member)); + HtmlTree tr = HtmlTree.TR(thRow); + HtmlTree td = new HtmlTree(HtmlTag.TD); + td.addStyle(HtmlStyle.colLast); List deprTrees = utils.getBlockTags(member, DocTree.Kind.DEPRECATED); if (!deprTrees.isEmpty()) { writer.addInlineDeprecatedComment(member, deprTrees.get(0), td); } - HtmlTree tr = HtmlTree.TR(td); + tr.addContent(td); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); altColor = !altColor; tbody.addContent(tr); @@ -477,8 +480,9 @@ public abstract class AbstractMemberWriter { tdFirst.addStyle(HtmlStyle.colFirst); writer.addSummaryType(this, element, tdFirst); tr.addContent(tdFirst); - HtmlTree tdLast = new HtmlTree(HtmlTag.TD); - tdLast.addStyle(HtmlStyle.colLast); + HtmlTree thType = new HtmlTree(HtmlTag.TH); + thType.addStyle(HtmlStyle.colSecond); + thType.addAttr(HtmlAttr.SCOPE, "row"); if (te != null && !utils.isConstructor(element) && !utils.isClass(element) @@ -487,14 +491,17 @@ public abstract class AbstractMemberWriter { HtmlTree name = new HtmlTree(HtmlTag.SPAN); name.addStyle(HtmlStyle.typeNameLabel); name.addContent(name(te) + "."); - tdLast.addContent(name); + thType.addContent(name); } addSummaryLink(utils.isClass(element) || utils.isInterface(element) ? LinkInfoImpl.Kind.CLASS_USE : LinkInfoImpl.Kind.MEMBER, - te, element, tdLast); - writer.addSummaryLinkComment(this, element, tdLast); - tr.addContent(tdLast); + te, element, thType); + tr.addContent(thType); + HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); + tdDesc.addStyle(HtmlStyle.colLast); + writer.addSummaryLinkComment(this, element, tdDesc); + tr.addContent(tdDesc); tbody.addContent(tr); } table.addContent(tbody); @@ -557,12 +564,15 @@ public abstract class AbstractMemberWriter { HtmlTree tdSummaryType = new HtmlTree(HtmlTag.TD); tdSummaryType.addStyle(HtmlStyle.colFirst); writer.addSummaryType(this, member, tdSummaryType); - HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); - setSummaryColumnStyle(tdSummary); - addSummaryLink(tElement, member, tdSummary); - writer.addSummaryLinkComment(this, member, firstSentenceTags, tdSummary); HtmlTree tr = HtmlTree.TR(tdSummaryType); - tr.addContent(tdSummary); + HtmlTree thSummaryLink = new HtmlTree(HtmlTag.TH); + setSummaryColumnStyleAndScope(thSummaryLink); + addSummaryLink(tElement, member, thSummaryLink); + tr.addContent(thSummaryLink); + HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); + tdDesc.addStyle(HtmlStyle.colLast); + writer.addSummaryLinkComment(this, member, firstSentenceTags, tdDesc); + tr.addContent(tdDesc); if (utils.isMethod(member) && !utils.isAnnotationType(member)) { int methodType = utils.isStatic(member) ? MethodTypes.STATIC.value() : MethodTypes.INSTANCE.value(); @@ -612,12 +622,13 @@ public abstract class AbstractMemberWriter { } /** - * Set the style for the summary column. + * Set the style and scope attribute for the summary column. * - * @param tdTree the column for which the style will be set + * @param thTree the column for which the style and scope attribute will be set */ - public void setSummaryColumnStyle(HtmlTree tdTree) { - tdTree.addStyle(HtmlStyle.colLast); + public void setSummaryColumnStyleAndScope(HtmlTree thTree) { + thTree.addStyle(HtmlStyle.colSecond); + thTree.addAttr(HtmlAttr.SCOPE, "row"); } /** diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java index f0392bcc1db..dd7ed67003c 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java @@ -25,8 +25,6 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.io.*; - import java.util.Arrays; import java.util.List; @@ -222,9 +220,7 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter */ public List getSummaryTableHeader(Element member) { List header = Arrays.asList(writer.getModifierTypeHeader(), - configuration.getText("doclet.0_and_1", - configuration.getText("doclet.Fields"), - configuration.getText("doclet.Description"))); + resources.getText("doclet.Fields"), resources.getText("doclet.Description")); return header; } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java index 2d493090872..237f443a247 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java @@ -133,9 +133,8 @@ public class AnnotationTypeOptionalMemberWriterImpl extends */ public List getSummaryTableHeader(Element member) { List header = Arrays.asList(writer.getModifierTypeHeader(), - configuration.getText("doclet.0_and_1", - configuration.getText("doclet.Annotation_Type_Optional_Member"), - configuration.getText("doclet.Description"))); + resources.getText("doclet.Annotation_Type_Optional_Member"), + resources.getText("doclet.Description")); return header; } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java index 3d2d0f8b328..06e4a158a1d 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java @@ -25,7 +25,6 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.io.*; import java.util.Arrays; import java.util.List; @@ -223,9 +222,7 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter */ public List getSummaryTableHeader(Element member) { List header = Arrays.asList(writer.getModifierTypeHeader(), - configuration.getText("doclet.0_and_1", - configuration.getText("doclet.Annotation_Type_Required_Member"), - configuration.getText("doclet.Description"))); + resources.getText("doclet.Annotation_Type_Required_Member"), resources.getText("doclet.Description")); return header; } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java index 75e1313106a..ac3e677f567 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java @@ -330,8 +330,8 @@ public class ClassUseWriter extends SubWriterHolderWriter { HtmlTree tr = new HtmlTree(HtmlTag.TR); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); altColor = !altColor; - Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst, getPackageLink(pkg)); - tr.addContent(tdFirst); + Content thFirst = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, getPackageLink(pkg)); + tr.addContent(thFirst); HtmlTree tdLast = new HtmlTree(HtmlTag.TD); tdLast.addStyle(HtmlStyle.colLast); addSummaryComment(pkg, tdLast); @@ -380,9 +380,9 @@ public class ClassUseWriter extends SubWriterHolderWriter { * @param contentTree the content tree to which the package use information will be added */ protected void addPackageUse(PackageElement pkg, Content contentTree) { - Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst, + Content thFirst = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, getHyperLink(getPackageAnchorName(pkg), new StringContent(utils.getPackageName(pkg)))); - contentTree.addContent(tdFirst); + contentTree.addContent(thFirst); HtmlTree tdLast = new HtmlTree(HtmlTag.TD); tdLast.addStyle(HtmlStyle.colLast); addSummaryComment(pkg, tdLast); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java index 57ee7012236..887d46fe868 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java @@ -25,7 +25,6 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.io.*; import java.util.*; import javax.lang.model.element.Modifier; @@ -332,7 +331,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons Content nameContent = getDocLink(LinkInfoImpl.Kind.CONSTANT_SUMMARY, member, member.getSimpleName(), false); Content code = HtmlTree.CODE(nameContent); - return HtmlTree.TD(code); + return HtmlTree.TH_ROW_SCOPE(HtmlStyle.colSecond, code); } /** diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java index f5bfb4a39bf..be59ef815c9 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java @@ -25,13 +25,13 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.io.*; import java.util.*; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; +import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag; @@ -168,11 +168,13 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter * {@inheritDoc} */ @Override - public void setSummaryColumnStyle(HtmlTree tdTree) { - if (foundNonPubConstructor) - tdTree.addStyle(HtmlStyle.colLast); - else - tdTree.addStyle(HtmlStyle.colOne); + public void setSummaryColumnStyleAndScope(HtmlTree thTree) { + if (foundNonPubConstructor) { + thTree.addStyle(HtmlStyle.colSecond); + } else { + thTree.addStyle(HtmlStyle.colFirst); + } + thTree.addAttr(HtmlAttr.SCOPE, "row"); } /** @@ -267,9 +269,8 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter if (foundNonPubConstructor) { header.add(resources.getText("doclet.Modifier")); } - header.add(resources.getText("doclet.0_and_1", - resources.getText("doclet.Constructor"), - resources.getText("doclet.Description"))); + header.add(resources.getText("doclet.Constructor")); + header.add(resources.getText("doclet.Description")); return header; } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java index 71b7e89e1d4..ef7681cf115 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java @@ -261,14 +261,13 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { for (DeprElementKind kind : DeprElementKind.values()) { if (deprapi.hasDocumentation(kind)) { addAnchor(deprapi, kind, div); - memberTableSummary = - configuration.getText("doclet.Member_Table_Summary", - configuration.getText(getHeadingKey(kind)), - configuration.getText(getSummaryKey(kind))); + memberTableSummary + = resources.getText("doclet.Member_Table_Summary", + resources.getText(getHeadingKey(kind)), + resources.getText(getSummaryKey(kind))); List memberTableHeader = new ArrayList<>(); - memberTableHeader.add(configuration.getText("doclet.0_and_1", - configuration.getText(getHeaderKey(kind)), - configuration.getText("doclet.Description"))); + memberTableHeader.add(resources.getText(getHeaderKey(kind))); + memberTableHeader.add(resources.getText("doclet.Description")); if (kind == DeprElementKind.PACKAGE) addPackageDeprecatedAPI(deprapi.getSet(kind), getHeadingKey(kind), memberTableSummary, memberTableHeader, div); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java index b4f6ccedb99..26a2c264499 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java @@ -25,8 +25,7 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.io.*; - +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -34,6 +33,7 @@ import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; +import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag; @@ -214,9 +214,8 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter */ @Override public List getSummaryTableHeader(Element member) { - List header = Arrays.asList(configuration.getText("doclet.0_and_1", - configuration.getText("doclet.Enum_Constant"), - configuration.getText("doclet.Description"))); + List header = Arrays.asList(resources.getText("doclet.Enum_Constant"), + resources.getText("doclet.Description")); return header; } @@ -259,8 +258,9 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter * {@inheritDoc} */ @Override - public void setSummaryColumnStyle(HtmlTree tdTree) { - tdTree.addStyle(HtmlStyle.colOne); + public void setSummaryColumnStyleAndScope(HtmlTree thTree) { + thTree.addStyle(HtmlStyle.colFirst); + thTree.addAttr(HtmlAttr.SCOPE, "row"); } /** diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java index 9afabb7aa7b..9a9c7a9d59a 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java @@ -25,7 +25,6 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.io.*; import java.util.Arrays; import java.util.List; @@ -215,9 +214,7 @@ public class FieldWriterImpl extends AbstractMemberWriter @Override public List getSummaryTableHeader(Element member) { List header = Arrays.asList(writer.getModifierTypeHeader(), - resources.getText("doclet.0_and_1", - resources.getText("doclet.Field"), - resources.getText("doclet.Description"))); + resources.getText("doclet.Field"), resources.getText("doclet.Description")); return header; } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java index 0703094fd3f..96a5e887ed6 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java @@ -405,7 +405,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { } Content classContent = getLink(new LinkInfoImpl( configuration, LinkInfoImpl.Kind.PACKAGE, te)); - Content tdClass = HtmlTree.TD(HtmlStyle.colFirst, classContent); + Content tdClass = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, classContent); HtmlTree tr = HtmlTree.TR(tdClass); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); altColor = !altColor; @@ -942,16 +942,20 @@ public class HtmlDocletWriter extends HtmlDocWriter { Content tr = new HtmlTree(HtmlTag.TR); final int size = header.size(); Content tableHeader; - if (size == 1) { + if (size == 2) { tableHeader = new StringContent(header.get(0)); - tr.addContent(HtmlTree.TH(HtmlStyle.colOne, scope, tableHeader)); + tr.addContent(HtmlTree.TH(HtmlStyle.colFirst, scope, tableHeader)); + tableHeader = new StringContent(header.get(1)); + tr.addContent(HtmlTree.TH(HtmlStyle.colLast, scope, tableHeader)); return tr; } for (int i = 0; i < size; i++) { tableHeader = new StringContent(header.get(i)); - if(i == 0) + if (i == 0) tr.addContent(HtmlTree.TH(HtmlStyle.colFirst, scope, tableHeader)); - else if(i == (size - 1)) + else if (i == 1) + tr.addContent(HtmlTree.TH(HtmlStyle.colSecond, scope, tableHeader)); + else if (i == (size - 1)) tr.addContent(HtmlTree.TH(HtmlStyle.colLast, scope, tableHeader)); else tr.addContent(HtmlTree.TH(scope, tableHeader)); @@ -1062,13 +1066,16 @@ public class HtmlDocletWriter extends HtmlDocWriter { boolean altColor = true; for (Element e : deprPkgs) { PackageElement pkg = (PackageElement) e; - HtmlTree td = HtmlTree.TD(HtmlStyle.colOne, + HtmlTree thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, getPackageLink(pkg, getPackageName(pkg))); + HtmlTree tr = HtmlTree.TR(thRow); + HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); + tdDesc.addStyle(HtmlStyle.colLast); List tags = utils.getDeprecatedTrees(pkg); if (!tags.isEmpty()) { - addInlineDeprecatedComment(pkg, tags.get(0), td); + addInlineDeprecatedComment(pkg, tags.get(0), tdDesc); } - HtmlTree tr = HtmlTree.TR(td); + tr.addContent(tdDesc); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); altColor = !altColor; tbody.addContent(tr); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java index 6c94d1eb3a8..89abfce4ecb 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java @@ -261,9 +261,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter @Override public List getSummaryTableHeader(Element member) { List header = Arrays.asList(writer.getModifierTypeHeader(), - resources.getText("doclet.0_and_1", - resources.getText("doclet.Method"), - resources.getText("doclet.Description"))); + resources.getText("doclet.Method"), resources.getText("doclet.Description")); return header; } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java index 866dc2c4382..5ff751d9f0e 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java @@ -159,11 +159,11 @@ public class ModuleIndexWriter extends AbstractModuleIndexWriter { for (ModuleElement mdle : modules) { if (!mdle.isUnnamed()) { Content moduleLinkContent = getModuleLink(mdle, new StringContent(mdle.getQualifiedName().toString())); - Content tdModule = HtmlTree.TD(HtmlStyle.colFirst, moduleLinkContent); + Content thModule = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, moduleLinkContent); HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); tdSummary.addStyle(HtmlStyle.colLast); addSummaryComment(mdle, tdSummary); - HtmlTree tr = HtmlTree.TR(tdModule); + HtmlTree tr = HtmlTree.TR(thModule); tr.addContent(tdSummary); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); tbody.addContent(tr); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java index b79ff717281..75ee6180efd 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java @@ -294,11 +294,11 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW public void addRequiresList(ModuleElement.RequiresDirective direct, Content tbody, boolean altColor) { ModuleElement m = direct.getDependency(); Content moduleLinkContent = getModuleLink(m, new StringContent(m.getQualifiedName().toString())); - Content tdPackage = HtmlTree.TD(HtmlStyle.colFirst, moduleLinkContent); + Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, moduleLinkContent); HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); tdSummary.addStyle(HtmlStyle.colLast); addSummaryComment(m, tdSummary); - HtmlTree tr = HtmlTree.TR(tdPackage); + HtmlTree tr = HtmlTree.TR(thPackage); tr.addContent(tdSummary); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); tbody.addContent(tr); @@ -347,27 +347,27 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW public void addExportedPackagesList(ModuleElement.ExportsDirective direct, Content tbody, boolean altColor) { PackageElement pkg = direct.getPackage(); Content pkgLinkContent = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))); - Content tdPackage = HtmlTree.TD(HtmlStyle.colFirst, pkgLinkContent); - HtmlTree tdModules = new HtmlTree(HtmlTag.TD); - tdModules.addStyle(HtmlStyle.colSecond); + Content tdPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, pkgLinkContent); + HtmlTree thModules = new HtmlTree(HtmlTag.TD); + thModules.addStyle(HtmlStyle.colSecond); List targetModules = direct.getTargetModules(); if (targetModules != null) { List mElements = direct.getTargetModules(); for (int i = 0; i < mElements.size(); i++) { if (i > 0) { - tdModules.addContent(new HtmlTree(HtmlTag.BR)); + thModules.addContent(new HtmlTree(HtmlTag.BR)); } ModuleElement m = mElements.get(i); - tdModules.addContent(new StringContent(m.getQualifiedName().toString())); + thModules.addContent(new StringContent(m.getQualifiedName().toString())); } } else { - tdModules.addContent(configuration.getText("doclet.All_Modules")); + thModules.addContent(configuration.getText("doclet.All_Modules")); } HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); tdSummary.addStyle(HtmlStyle.colLast); addSummaryComment(pkg, tdSummary); HtmlTree tr = HtmlTree.TR(tdPackage); - tr.addContent(tdModules); + tr.addContent(thModules); tr.addContent(tdSummary); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); tbody.addContent(tr); @@ -428,11 +428,11 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW public void addUsesList(ModuleElement.UsesDirective direct, Content tbody, boolean altColor) { TypeElement type = direct.getService(); Content typeLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, type)); - Content tdPackage = HtmlTree.TD(HtmlStyle.colFirst, typeLinkContent); + Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, typeLinkContent); HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); tdSummary.addStyle(HtmlStyle.colLast); addSummaryComment(type, tdSummary); - HtmlTree tr = HtmlTree.TR(tdPackage); + HtmlTree tr = HtmlTree.TR(thPackage); tr.addContent(tdSummary); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); tbody.addContent(tr); @@ -463,18 +463,18 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW TypeElement srv = direct.getService(); Content implLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl)); Content srvLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, srv)); - HtmlTree tdType = HtmlTree.TD(HtmlStyle.colFirst, srvLinkContent); - tdType.addContent(new HtmlTree(HtmlTag.BR)); - tdType.addContent("("); + HtmlTree thType = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, srvLinkContent); + thType.addContent(new HtmlTree(HtmlTag.BR)); + thType.addContent("("); HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation); - tdType.addContent(implSpan); - tdType.addContent(Contents.SPACE); - tdType.addContent(implLinkContent); - tdType.addContent(")"); + thType.addContent(implSpan); + thType.addContent(Contents.SPACE); + thType.addContent(implLinkContent); + thType.addContent(")"); HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); tdDesc.addStyle(HtmlStyle.colLast); addSummaryComment(srv, tdDesc); - HtmlTree tr = HtmlTree.TR(tdType); + HtmlTree tr = HtmlTree.TR(thType); tr.addContent(tdDesc); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); tbody.addContent(tr); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java index f43f53eb39a..4c34b2ec9df 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java @@ -25,8 +25,6 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.io.*; - import java.util.Arrays; import java.util.List; @@ -118,15 +116,11 @@ public class NestedClassWriterImpl extends AbstractMemberWriter public List getSummaryTableHeader(Element member) { if (utils.isInterface(member)) { return Arrays.asList(writer.getModifierTypeHeader(), - configuration.getText("doclet.0_and_1", - configuration.getText("doclet.Interface"), - configuration.getText("doclet.Description"))); + resources.getText("doclet.Interface"), resources.getText("doclet.Description")); } else { return Arrays.asList(writer.getModifierTypeHeader(), - configuration.getText("doclet.0_and_1", - configuration.getText("doclet.Class"), - configuration.getText("doclet.Description"))); + resources.getText("doclet.Class"), resources.getText("doclet.Description")); } } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java index f9c0d3b3613..f6360804701 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java @@ -151,11 +151,11 @@ public class PackageIndexWriter extends AbstractPackageIndexWriter { if (!pkg.isUnnamed()) { if (!(configuration.nodeprecated && utils.isDeprecated(pkg))) { Content packageLinkContent = getPackageLink(pkg, getPackageName(pkg)); - Content tdPackage = HtmlTree.TD(HtmlStyle.colFirst, packageLinkContent); + Content thPackage = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, packageLinkContent); HtmlTree tdSummary = new HtmlTree(HtmlTag.TD); tdSummary.addStyle(HtmlStyle.colLast); addSummaryComment(pkg, tdSummary); - HtmlTree tr = HtmlTree.TR(tdPackage); + HtmlTree tr = HtmlTree.TR(thPackage); tr.addContent(tdSummary); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); tbody.addContent(tr); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java index 05b966ec318..726c64ff927 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java @@ -187,9 +187,7 @@ public class PackageUseWriter extends SubWriterHolderWriter { */ protected void addClassList(Content contentTree) { List classTableHeader = Arrays.asList( - configuration.getText("doclet.0_and_1", - configuration.getText("doclet.Class"), - configuration.getText("doclet.Description"))); + resources.getText("doclet.Class"), resources.getText("doclet.Description")); for (String packageName : usingPackageToUsedClasses.keySet()) { PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName); HtmlTree li = new HtmlTree(HtmlTag.LI); @@ -234,10 +232,13 @@ public class PackageUseWriter extends SubWriterHolderWriter { DocPath dp = pathString(usedClass, DocPaths.CLASS_USE.resolve(DocPath.forName(utils, usedClass))); StringContent stringContent = new StringContent(utils.getSimpleName(usedClass)); - Content td = HtmlTree.TD(HtmlStyle.colOne, + Content thType = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, getHyperLink(dp.fragment(getPackageAnchorName(pkg)), stringContent)); - addIndexComment(usedClass, td); - contentTree.addContent(td); + contentTree.addContent(thType); + HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); + tdDesc.addStyle(HtmlStyle.colLast); + addIndexComment(usedClass, tdDesc); + contentTree.addContent(tdDesc); } /** @@ -247,10 +248,10 @@ public class PackageUseWriter extends SubWriterHolderWriter { * @param contentTree the content tree to which the information will be added */ protected void addPackageUse(PackageElement pkg, Content contentTree) { - Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst, + Content thFirst = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, getHyperLink(utils.getPackageName(pkg), new StringContent(utils.getPackageName(pkg)))); - contentTree.addContent(tdFirst); + contentTree.addContent(thFirst); HtmlTree tdLast = new HtmlTree(HtmlTag.TD); tdLast.addStyle(HtmlStyle.colLast); if (pkg != null && !pkg.isUnnamed()) { diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java index f6c2eaba492..e787014a798 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java @@ -229,8 +229,8 @@ public class PackageWriterImpl extends HtmlDocletWriter } Content classContent = getLink(new LinkInfoImpl( configuration, LinkInfoImpl.Kind.PACKAGE, klass)); - Content tdClass = HtmlTree.TD(HtmlStyle.colFirst, classContent); - HtmlTree tr = HtmlTree.TR(tdClass); + Content thClass = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, classContent); + HtmlTree tr = HtmlTree.TR(thClass); tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java index 24c9f96776c..7538fd6c57a 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java @@ -25,8 +25,6 @@ package jdk.javadoc.internal.doclets.formats.html; -import java.io.*; - import java.util.Arrays; import java.util.List; @@ -235,10 +233,8 @@ public class PropertyWriterImpl extends AbstractMemberWriter */ @Override public List getSummaryTableHeader(Element member) { - List header = Arrays.asList(configuration.getText("doclet.Type"), - configuration.getText("doclet.0_and_1", - configuration.getText("doclet.Property"), - configuration.getText("doclet.Description"))); + List header = Arrays.asList(resources.getText("doclet.Type"), + resources.getText("doclet.Property"), resources.getText("doclet.Description")); return header; } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java index 3b5de9f4cd4..e6c262d7cfc 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java @@ -48,7 +48,6 @@ public enum HtmlStyle { classUseContainer, colFirst, colLast, - colOne, colSecond, constantsSummary, constantValuesContainer, diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java index 2b4e0def4b6..062dccc8e12 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java @@ -807,6 +807,17 @@ public class HtmlTree extends Content { return TH(null, scope, body); } + /** + * Generates a TH tag with style class, scope attribute and some content. + * + * @param styleClass style for the tag + * @param body content for the tag + * @return an HtmlTree object for the TH tag + */ + public static HtmlTree TH_ROW_SCOPE(HtmlStyle styleClass, Content body) { + return TH(styleClass, "row", body); + } + /** * Generates a TITLE tag with some content. * diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css index a74bf144c27..99ce43cb68d 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css @@ -528,20 +528,23 @@ Table styles float:left; } +.rowColor th, .altColor th { + font-weight:normal; +} .overviewSummary td, .memberSummary td, .typeSummary td, .useSummary td, .constantsSummary td, .deprecatedSummary td, .requiresSummary td, .packagesSummary td, .providesSummary td, .usesSummary td { text-align:left; padding:0px 0px 12px 10px; } -th.colOne, th.colFirst, th.colSecond, th.colLast, .useSummary th, .constantsSummary th, .packagesSummary th, -td.colOne, td.colFirst, td.colSecond, td.colLast, .useSummary td, .constantsSummary td { +th.colFirst, th.colSecond, th.colLast, .useSummary th, .constantsSummary th, .packagesSummary th, +td.colFirst, td.colSecond, td.colLast, .useSummary td, .constantsSummary td { vertical-align:top; padding-right:0px; padding-top:8px; padding-bottom:3px; } -th.colFirst, th.colSecond, th.colLast, th.colOne, .constantsSummary th, .packagesSummary th { +th.colFirst, th.colSecond, th.colLast, .constantsSummary th, .packagesSummary th { background:#dee3e9; text-align:left; padding:8px 3px 3px 7px; @@ -550,10 +553,10 @@ td.colFirst, th.colFirst { white-space:nowrap; font-size:13px; } -td.colLast, th.colLast { +td.colSecond, th.colSecond, td.colLast, th.colLast { font-size:13px; } -td.colOne, th.colOne, .constantsSummary th, .packagesSummary th { +.constantsSummary th, .packagesSummary th { font-size:13px; } .providesSummary th.colFirst, .providesSummary th.colLast, .providesSummary td.colFirst, @@ -567,23 +570,22 @@ td.colOne, th.colOne, .constantsSummary th, .packagesSummary th { .packagesSummary td.colFirst, .packagesSummary td.colSecond, .packagesSummary th.colFirst, .packagesSummary th, .usesSummary td.colFirst, .usesSummary th.colFirst, .useSummary td.colFirst, .useSummary th.colFirst, -.overviewSummary td.colOne, .overviewSummary th.colOne, .memberSummary td.colFirst, .memberSummary th.colFirst, -.memberSummary td.colOne, .memberSummary th.colOne, +.memberSummary td.colSecond, .memberSummary th.colSecond, .typeSummary td.colFirst{ width:25%; vertical-align:top; } -td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colSecond a:link, td.colSecond a:active, td.colSecond a:visited, td.colSecond a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { +td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colSecond a:link, td.colSecond a:active, td.colSecond a:visited, td.colSecond a:hover, th.colFirst a:link, th.colFirst a:active, th.colFirst a:visited, th.colFirst a:hover, th.colSecond a:link, th.colSecond a:active, th.colSecond a:visited, th.colSecond a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { font-weight:bold; } .tableSubHeadingColor { background-color:#EEEEFF; } -.altColor { +.altColor, .altColor th { background-color:#FFFFFF; } -.rowColor { +.rowColor, .rowColor th { background-color:#EEEEEF; } /* @@ -774,4 +776,4 @@ ul.ui-autocomplete li { .searchTagHolderResult { font-style:italic; font-size:12px; -} +} \ No newline at end of file diff --git a/langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java b/langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java index 882e8769281..f94cbc47194 100644 --- a/langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java +++ b/langtools/test/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4504730 4526070 5077317 + * @bug 4504730 4526070 5077317 8162363 * @summary Test the generation of constant-values.html. * @author jamieh * @library ../lib @@ -53,29 +53,29 @@ public class TestConstantValuesDriver extends JavadocTester { "TEST4PASSES", "\"<Hello World>\"", "public static final byte\n" + - "" + - "BYTE_MAX_VALUE\n" + + "" + + "BYTE_MAX_VALUE\n" + "127", "public static final byte\n" + - "" + - "BYTE_MIN_VALUE\n" + + "" + + "BYTE_MIN_VALUE\n" + "-127", "public static final char\n" + - "" + - "CHAR_MAX_VALUE\n" + + "" + + "CHAR_MAX_VALUE\n" + "65535", "public static final double", - "" + - "DOUBLE_MAX_VALUE\n" + + "" + + "DOUBLE_MAX_VALUE\n" + "1.7976931348623157E308", "public static final double\n" + - "" + - "DOUBLE_MIN_VALUE", + "" + + "DOUBLE_MIN_VALUE", "public static final boolean\n" + - "" + - "GOODBYE", + "" + + "GOODBYE", "public static final boolean\n" + - "HELLO\n" + + "HELLO\n" + "true" ); } diff --git a/langtools/test/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java b/langtools/test/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java index ac867105ded..0cfe4b0f0e0 100644 --- a/langtools/test/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java +++ b/langtools/test/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4973609 8015249 8025633 8026567 6469561 8071982 + * @bug 4973609 8015249 8025633 8026567 6469561 8071982 8162363 * @summary Make sure that annotation types with 0 members does not have * extra HR tags. * @author jamieh @@ -56,9 +56,9 @@ public class TestAnnotationTypes extends JavadocTester { + "field.detail\">Field | ", "", "

Field Summary

", - "DEFAULT_NAME" - + " ", + + "", "", "

DEFAULT_NAME

\n" + "
static final java."
diff --git a/langtools/test/jdk/javadoc/doclet/testHeadings/TestHeadings.java b/langtools/test/jdk/javadoc/doclet/testHeadings/TestHeadings.java
index e93becd44ae..c7811ce5843 100644
--- a/langtools/test/jdk/javadoc/doclet/testHeadings/TestHeadings.java
+++ b/langtools/test/jdk/javadoc/doclet/testHeadings/TestHeadings.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4905786 6259611
+ * @bug      4905786 6259611 8162363
  * @summary  Make sure that headings use the TH tag instead of the TD tag.
  * @author   jamieh
  * @library ../lib
@@ -76,7 +76,8 @@ public class TestHeadings extends JavadocTester {
         // Class documentation
         checkOutput("pkg1/C1.html", true,
                 "Modifier and Type\n"
-                + "Field and Description",
+                + "Field\n"
+                + "Description",
                 "
Methods inherited from class java.lang.Object
");
 
         // Class use documentation
@@ -84,17 +85,19 @@ public class TestHeadings extends JavadocTester {
                 "Package\n"
                 + "Description",
                 "Modifier and Type\n"
-                + "Field and Description");
+                + "Field\n"
+                + "Description");
 
         // Deprecated
         checkOutput("deprecated-list.html", true,
-                "Method and Description");
+                "Method\n"
+                + "Description");
 
         // Constant values
         checkOutput("constant-values.html", true,
                 ""
                 + "Modifier and Type\n"
-                + "Constant Field\n"
+                + "Constant Field\n"
                 + "Value");
 
         // Serialized Form
diff --git a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java b/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
index e11de5b4e4a..87102f2d1f9 100644
--- a/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
+++ b/langtools/test/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      6786688 8008164
+ * @bug      6786688 8008164 8162363
  * @summary  HTML tables should have table summary, caption and table headers.
  * @author   Bhavesh Patel
  * @library  ../lib
@@ -282,25 +282,32 @@ public class TestHtmlTableTags extends JavadocTester {
         // Class documentation
         checkOutput("pkg1/C1.html", true,
                 "Modifier and Type\n"
-                + "Field and Description",
+                + "Field\n"
+                + "Description",
                 "Modifier and Type\n"
-                + "Method and Description");
+                + "Method\n"
+                + "Description");
 
         checkOutput("pkg2/C2.html", true,
                 "Modifier and Type\n"
-                + "Class and Description",
-                "Constructor and Description");
+                + "Class\n"
+                + "Description",
+                "Constructor\n"
+                + "Description");
 
         checkOutput("pkg2/C2.ModalExclusionType.html", true,
-                "Enum Constant and Description");
+                "Enum Constant\n"
+                + "Description");
 
         checkOutput("pkg2/C3.html", true,
                 "Modifier and Type\n"
-                + "Required Element and Description");
+                + "Required Element\n"
+                + "Description");
 
         checkOutput("pkg2/C4.html", true,
                 "Modifier and Type\n"
-                + "Optional Element and Description");
+                + "Optional Element\n"
+                + "Description");
 
         // Class use documentation
         checkOutput("pkg1/class-use/I1.html", true,
@@ -309,43 +316,52 @@ public class TestHtmlTableTags extends JavadocTester {
 
         checkOutput("pkg1/class-use/C1.html", true,
                 "Modifier and Type\n"
-                + "Field and Description",
+                + "Field\n"
+                + "Description",
                 "Modifier and Type\n"
-                + "Method and Description");
+                + "Method\n"
+                + "Description");
 
         checkOutput("pkg2/class-use/C2.html", true,
                 "Modifier and Type\n"
-                + "Field and Description",
+                + "Field\n"
+                + "Description",
                 "Modifier and Type\n"
-                + "Method and Description");
+                + "Method\n"
+                + "Description");
 
         checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
                 "Package\n"
                 + "Description",
                 "Modifier and Type\n"
-                + "Method and Description");
+                + "Method\n"
+                + "Description");
 
         // Package use documentation
         checkOutput("pkg1/package-use.html", true,
                 "Package\n"
                 + "Description",
-                "Class and Description");
+                "Class\n"
+                + "Description");
 
         checkOutput("pkg2/package-use.html", true,
                 "Package\n"
                 + "Description",
-                "Class and Description");
+                "Class\n"
+                + "Description");
 
         // Deprecated
         checkOutput("deprecated-list.html", true,
-                "Field and Description",
-                "Method and Description");
+                "Field\n"
+                + "Description",
+                "Method\n"
+                + "Description");
 
         // Constant values
         checkOutput("constant-values.html", true,
                 ""
                 + "Modifier and Type\n"
-                + "Constant Field\n"
                 + "Value");
 
diff --git a/langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
index b7543b5a6d3..e738b85d0f9 100644
--- a/langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
+++ b/langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130
+ * @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363
  * @summary Test of the JavaFX doclet features.
  * @author jvalenta
  * @library ../lib
@@ -61,19 +61,17 @@ public class TestJavaFX extends JavadocTester {
                     + "
Gets the value of the property rate.
\n"
                     + "
\n"
                     + "
Property description:
",
-                ""
-                    + "rate\n"
-                    + "
Defines the direction/speed at which the "
-                    + "Timeline is expected to",
+                ""
+                    + "rate",
                 "Default value:",
                 "Since:\n"
                     + "
JavaFX 8.0
",
                 "
Sets the value of the property Property",
                 "
Gets the value of the property Property",
                 "Property description:",
-                ""
+                ""
                     + ""
-                    + "setTestMethodProperty() ",
+                    + "setTestMethodProperty()",
                 "
isPaused
\n"
                     + "
public final double isPaused()
\n"
                     + "
Gets the value of the property paused.
");
@@ -152,34 +150,34 @@ public class TestJavaFX extends JavadocTester {
         checkOutput("pkg2/Test.html", false, "
Property Summary
");
         checkOutput("pkg2/Test.html", true,
                 "Modifier and Type\n"
-                + "Method and Description\n"
+                + "Method\n"
+                + "Description\n"
                 + "\n"
                 + "\n"
                 + "<T> java.lang.Object\n"
-                + ""
-                + ""
-                + "alphaProperty(java.util.List<T> foo) \n"
+                + ""
+                + "alphaProperty"
+                + "(java.util.List<T> foo)\n"
+                + " \n"
                 + "\n"
                 + "\n"
                 + "java.lang.Object\n"
-                + ""
-                + "betaProperty()"
-                + " \n"
+                + ""
+                + "betaProperty()\n"
+                + " \n"
                 + "\n"
                 + "\n"
-                + ""
-                + "java.util.List<java.util.Set<? super java.lang.Object>>"
+                + "java.util.List<java.util.Set<? super java.lang.Object>>"
                 + "\n"
-                + ""
-                + ""
-                + "deltaProperty() \n"
+                + ""
+                + "deltaProperty()\n"
+                + " \n"
                 + "\n"
                 + "\n"
-                + "java.util.List<java.lang.String>"
-                + "\n"
-                + ""
-                + "gammaProperty"
-                + "() "
+                + "java.util.List<java.lang.String>\n"
+                + ""
+                + "gammaProperty()\n"
+                + " "
         );
     }
 
diff --git a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java b/langtools/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java
index 9b1b4257ea8..3ad67a283eb 100644
--- a/langtools/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java
+++ b/langtools/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4638588 4635809 6256068 6270645 8025633 8026567
+ * @bug 4638588 4635809 6256068 6270645 8025633 8026567 8162363
  * @summary Test to make sure that members are inherited properly in the Javadoc.
  *          Verify that inheritence labels are correct.
  * @author jamieh
@@ -90,10 +90,10 @@ public class TestMemberInheritence extends JavadocTester {
         checkOutput("pkg1/Implementer.html", true,
                 // ensure the method makes it
                 "static java.time.Period\n"
-                + ""
+                + ""
                 + ""
                 + "between(java.time.LocalDate startDateInclusive,\n"
-                + "       java.time.LocalDate endDateExclusive) ",
+                + "       java.time.LocalDate endDateExclusive)",
                 // check the inherited from interfaces
                 "
Methods inherited from interface pkg1.Interface
\n"
diff --git a/langtools/test/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java b/langtools/test/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java
index 4dc5ce53587..560c9f1e138 100644
--- a/langtools/test/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java
+++ b/langtools/test/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4951228 6290760 8025633 8026567 8081854
+ * @bug      4951228 6290760 8025633 8026567 8081854 8162363
  * @summary  Test the case where the overriden method returns a different
  *           type than the method in the child class.  Make sure the
  *           documentation is inherited but the return type isn't.
@@ -51,7 +51,7 @@ public class TestMemberSummary extends JavadocTester {
         checkOutput("pkg/PublicChild.html", true,
                 // Check return type in member summary.
                 "PublicChild\n"
-                + ""
+                + ""
                 + "returnTypeTest()",
                 // Check return type in member detail.
                 "
public "
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java
index 79e166c9b8f..12703fa145a 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995
+ * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363
  * @summary Test modules support in javadoc.
  * @author bpatel
  * @library ../lib
@@ -397,7 +397,7 @@ public class TestModules extends JavadocTester {
                 + "");
         checkOutput("module1-summary.html", true,
                 "\n"
-                + "testpkgmdl1\n"
+                + "testpkgmdl1\n"
                 + "All Modules\n"
                 + " \n"
                 + "");
@@ -408,7 +408,7 @@ public class TestModules extends JavadocTester {
                 + "");
         checkOutput("module1-summary.html", true,
                 "\n"
-                + "module2\n"
+                + "module2\n"
                 + "\n"
                 + "
This is a test description for the module2 module.
\n"
                 + "\n"
@@ -424,8 +424,8 @@ public class TestModules extends JavadocTester {
                 + "");
         checkOutput("module2-summary.html", true,
                 "\n"
-                + ""
-                + "testpkg2mdl2\n"
+                + ""
+                + "testpkg2mdl2\n"
                 + "module1\n"
                 + " \n"
                 + "");
@@ -436,7 +436,7 @@ public class TestModules extends JavadocTester {
                 + "");
         checkOutput("module2-summary.html", true,
                 "\n"
-                + "java.base\n"
+                + "java.base\n"
                 + " \n"
                 + "");
         checkOutput("module2-summary.html", true,
@@ -446,24 +446,24 @@ public class TestModules extends JavadocTester {
                 + "");
         checkOutput("module2-summary.html", true,
                 "\n"
-                + "TestClassInModule2\n"
+                + "TestClassInModule2\n"
                 + " \n"
                 + "");
         checkOutput("module2-summary.html", true,
                 "\n"
-                + "TestInterfaceInModule2
"
                 + "(Implementation: "
                 + ""
-                + "TestClassInModule2)\n"
+                + "TestClassInModule2)\n"
                 + " \n"
                 + "Exported Packages \n"
                 + "\n"
                 + "Package\n"
-                + "Module\n"
+                + "Module\n"
                 + "Description\n"
                 + "");
         checkOutput("module2-summary.html", true,
diff --git a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java b/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
index 312fcf47839..048c310b0ea 100644
--- a/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
+++ b/langtools/test/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 8026567
+ * @bug      4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 8026567 8162363
  * @summary  Run Javadoc on a set of source files that demonstrate new
  *           language features.  Check the output to ensure that the new
  *           language features are properly documented.
@@ -134,7 +134,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
                 // Method that returns TypeParameters
                 "E[]\n"
-                + ""
+                + ""
                 + ""
                 + "methodThatReturnsTypeParameterA(E[] e)",
@@ -144,15 +144,15 @@ public class TestNewLanguageFeatures extends JavadocTester {
                 + "title=\"type parameter in TypeParameters\">E[] e)
\n",
                 "<T extends java.lang.Object & java.lang.Comparable<? super T>>"
                 + "
T\n"
-                + ""
+                + ""
                 + ""
-                + "methodtThatReturnsTypeParametersB(java.util.Collection<? extends T> coll)\n"
-                + "
Returns TypeParameters
\n",
+                + "methodtThatReturnsTypeParametersB(java.util.Collection<? extends T> coll)",
+                "
Returns TypeParameters
\n",
                 // Method takes a TypeVariable
                 "<X extends java.lang.Throwable>
"
                 + "E"
                 + "\n"
-                + ""
+                + ""
                 + ""
                 + "orElseThrow(java.util.function.Supplier<? extends X> exceptionSupplier)"
                 );
@@ -219,19 +219,19 @@ public class TestNewLanguageFeatures extends JavadocTester {
                 + "package-summary.html\">pkg2 with type parameters of "
                 + "type "
                 + "Foo ",
-                "ClassUseTest1<T extends "
                 + "Foo"
                 + " & "
-                + "Foo2> ",
+                + "Foo2>",
                 "Methods in pkg2 with type parameters of "
                 + "type Foo ",
-                "ClassUseTest1."
+                "ClassUseTest1."
                 + "method"
-                + "(T t) ",
+                + "(T t)",
                 "Fields in pkg2 with type parameters of "
                 + "type "
@@ -259,20 +259,20 @@ public class TestNewLanguageFeatures extends JavadocTester {
                 + "type Foo2 "
                 + "",
-                "ClassUseTest1<T extends "
                 + "Foo"
                 + " & "
-                + "Foo2> ",
+                + "Foo2>",
                 "Methods in pkg2 with type parameters of "
                 + "type Foo2 "
                 + "",
-                ""
+                ""
                 + "ClassUseTest1.method"
-                + "(T t) "
+                + "(T t)"
         );
 
         // ClassUseTest2: >
@@ -282,20 +282,20 @@ public class TestNewLanguageFeatures extends JavadocTester {
                 + "type ParamTest"
                 + " ",
-                "ClassUseTest2<T extends "
                 + ""
                 + "ParamTest<"
-                + "Foo3>> ",
+                + "Foo3>>",
                 "Methods in pkg2 with type parameters of "
                 + "type ParamTest"
                 + " ",
-                "ClassUseTest2."
+                "ClassUseTest2."
                 + "method"
-                + "(T t) ",
+                + "(T t)",
                 "Fields in pkg2 declared as ParamTest"
@@ -323,20 +323,20 @@ public class TestNewLanguageFeatures extends JavadocTester {
                 + "package-summary.html\">pkg2 with type parameters of "
                 + "type "
                 + "Foo3 ",
-                "ClassUseTest2<T extends "
                 + ""
                 + "ParamTest<"
-                + "Foo3>> ",
+                + "Foo3>>",
                 "Methods in pkg2 with type parameters of "
                 + "type Foo3 "
                 + "",
-                "ClassUseTest2."
+                "ClassUseTest2."
                 + "method"
-                + "(T t) ",
+                + "(T t)",
                 "Methods in pkg2 that return types with "
                 + "arguments of type ParamTest2"
                 + " ",
-                "ClassUseTest3<T extends "
                 + ""
                 + "ParamTest2<java.util.List<? extends "
                 + ""
-                + "Foo4>>> ",
+                + "Foo4>>>",
                 "Methods in pkg2 with type parameters of "
                 + "type ParamTest2"
                 + " ",
-                "ClassUseTest3"
+                "ClassUseTest3"
                 + ".method(T t) ",
+                + "html#method-T-\">method(T t)",
                 "<T extends "
                 + "ParamTest2<java.util.List<? extends Foo4 "
                 + "",
-                "ClassUseTest3<T extends "
                 + ""
                 + "ParamTest2<java.util.List<? extends "
                 + ""
-                + "Foo4>>> ",
+                + "Foo4>>>",
                 "Methods in pkg2 with type parameters of "
                 + "type Foo4 ",
-                "ClassUseTest3."
+                "ClassUseTest3."
                 + "method(T t)"
-                + " ",
+                + "",
                 "Methods in pkg2 that return types with "
                 + "arguments of type \n"
                 + "\n"
                 + "Modifier and Type\n"
-                + "Method and Description\n"
+                + "Method\n"
+                + "Description\n"
                 + "\n"
                 + "\n"
                 + "\n"
                 + "void\n"
-                + "ClassUseTest3."
+                + "ClassUseTest3."
                 + "method(java."
                 + "util.Set<Foo4> p) \n"
-                + "\n"
-                + "",
+                + "class in pkg2\">Foo4> p)",
                 "Constructor parameters in pkg2 with type arguments "
                 + "of type <Unnamed>");
+                "<Unnamed>");
 
         checkFiles(false,
                 "pkg1/package-summary.html",
diff --git a/langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
index fc37f6ed400..025bf8a6c95 100644
--- a/langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
+++ b/langtools/test/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461 8154261
+ * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461 8154261 8162363
  * @summary  Run tests on doclet stylesheet.
  * @author   jamieh
  * @library  ../lib
@@ -139,9 +139,8 @@ public class TestStylesheet extends JavadocTester {
                 + ".packagesSummary td.colFirst, .packagesSummary td.colSecond, .packagesSummary th.colFirst, .packagesSummary th,\n"
                 + ".usesSummary td.colFirst, .usesSummary th.colFirst,\n"
                 + ".useSummary td.colFirst, .useSummary th.colFirst,\n"
-                + ".overviewSummary td.colOne, .overviewSummary th.colOne,\n"
                 + ".memberSummary td.colFirst, .memberSummary th.colFirst,\n"
-                + ".memberSummary td.colOne, .memberSummary th.colOne,\n"
+                + ".memberSummary td.colSecond, .memberSummary th.colSecond,\n"
                 + ".typeSummary td.colFirst{\n"
                 + "    width:25%;\n"
                 + "    vertical-align:top;\n"
diff --git a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java b/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
index 088777b7bad..04f0fd659c0 100644
--- a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
+++ b/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      8005091 8009686 8025633 8026567 6469562 8071982 8071984
+ * @bug      8005091 8009686 8025633 8026567 6469562 8071982 8071984 8162363
  * @summary  Make sure that type annotations are displayed correctly
  * @author   Bhavesh Patel
  * @library  ../lib
@@ -473,7 +473,7 @@ public class TestTypeAnnotations extends JavadocTester {
                 + "\" title=\"annotation in typeannos\">@RepTypeUseB ... vararg)");
 
         checkOutput("typeannos/RepeatingOnField.html", true,
-                "(package private) java.lang.Integer\n"
+                "(package private) java.lang.Integer\n"
                 + "i1",
 
@@ -483,7 +483,7 @@ public class TestTypeAnnotations extends JavadocTester {
                 + "@RepTypeUseA @RepTypeUseB @RepTypeUseB java.lang.Integer\n"
-                + "i2",
 
                 "(package private) "
                 + "@RepTypeUseB @RepTypeUseB java.lang.Integer"
-                + "\n"
+                + "\n"
                 + "i3",
 
                 "(package private) "
                 + "@RepAllContextsB @RepAllContextsB java.lang.Integer"
-                + "\n"
+                + "\n"
                 + "i4",
 
                 "(package private) java.lang.String @RepTypeUseA @RepTypeUseB "
-                + "@RepTypeUseB []\n []\nsa",
 
@@ -572,8 +572,8 @@ public class TestTypeAnnotations extends JavadocTester {
                 + "@RepTypeUseB [] sa
"); checkOutput("typeannos/RepeatingOnMethod.html", true, - "(package private) java.lang.String\n(package private) java.lang.String\n" + + "test1()", "(package private) @RepTypeUseB @RepTypeUseB java.lang.String" - + "\n" + + "\n" + "test2" + "()", @@ -592,7 +592,7 @@ public class TestTypeAnnotations extends JavadocTester { + "@RepTypeUseA @RepTypeUseB @RepTypeUseB java.lang.String" - + "\n" + + "\n" + "test3" + "()", @@ -602,7 +602,7 @@ public class TestTypeAnnotations extends JavadocTester { + "@RepAllContextsA @RepAllContextsB " - + "@RepAllContextsB java.lang.String\n" + + "@RepAllContextsB java.lang.String\n" + "test4()", @@ -682,12 +682,12 @@ public class TestTypeAnnotations extends JavadocTester { checkOutput("typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html", true, "(package private) <T> java.lang.String\n" - + "genericMethod(T t)", "(package private) <T> java.lang.String\n" - + "genericMethod2(@RepTypeUseA @RepTypeUseB @RepTypeUseB T t)", - "(package private) java.lang.String\n" + "(package private) java.lang.String\n" + "test()", diff --git a/langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java b/langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java index 9f79964a3d8..409969beeb5 100644 --- a/langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java +++ b/langtools/test/jdk/javadoc/doclet/testUseOption/TestUseOption.java @@ -23,7 +23,7 @@ /* * @test - * @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 + * @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363 * @summary A simple test to ensure class-use files are correct. * @author jamieh * @library ../lib @@ -124,17 +124,17 @@ public class TestUseOption extends JavadocTester { checkOutput("pkg1/class-use/UsedInterface.html", true, "Subinterfaces of " + "UsedInterface in pkg1", - "interface \n" + "interface \n" + "SubInterface<T> " + + "title=\"interface in pkg1\">SubInterface<T>" ); checkOutput("pkg1/class-use/UsedThrowable.html", true, "Methods in pkg1 that throw " + "UsedThrowable", - "void\nvoid\nC1." + "methodInC1ThrowsThrowable" - + "() " + + "()" ); } @@ -154,9 +154,9 @@ public class TestUseOption extends JavadocTester { "
  • " ); checkOutput("package-use.html", true, - "" - + "UsedInC ", - "<Unnamed>\n" + "" + + "UsedInC", + "<Unnamed>\n" + " " ); }