stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8223364: Bad placement of anchor relative to header

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Hannes Wallnöfer 2019-06-12 13:21:25 +02:00
parent 62d7317f86
commit 0d8209a2b7
20 changed files with 106 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
View File

@ -33,6 +33,7 @@ import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeFieldWriter;
@ -104,9 +105,9 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
if (!writer.printedAnnotationFieldHeading) {
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.fieldDetailsLabel);
memberDetailsTree.add(heading);
memberDetailsTree.add(links.createAnchor(
SectionName.ANNOTATION_TYPE_FIELD_DETAIL));
memberDetailsTree.add(heading);
writer.printedAnnotationFieldHeading = true;
}
return memberDetailsTree;
@ -119,9 +120,8 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
Content annotationDetailsTree) {
Content annotationDocTree = new ContentBuilder();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
heading.add(name(member));
heading.add(links.createAnchor(name(member), new StringContent(name(member))));
annotationDocTree.add(heading);
annotationDocTree.add(links.createAnchor(name(member)));
return HtmlTree.SECTION(HtmlStyle.detail, annotationDocTree);
}

8
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
View File

@ -33,6 +33,7 @@ import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeRequiredMemberWriter;
@ -106,9 +107,9 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
if (!writer.printedAnnotationHeading) {
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.annotationTypeDetailsLabel);
memberDetailsTree.add(heading);
memberDetailsTree.add(links.createAnchor(
SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL));
memberDetailsTree.add(heading);
writer.printedAnnotationHeading = true;
}
return memberDetailsTree;
@ -122,10 +123,9 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
String simpleName = name(member);
Content annotationDocTree = new ContentBuilder();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
heading.add(simpleName);
heading.add(links.createAnchor(
simpleName + utils.signature((ExecutableElement) member), new StringContent(simpleName)));
annotationDocTree.add(heading);
annotationDocTree.add(links.createAnchor(
simpleName + utils.signature((ExecutableElement) member)));
return HtmlTree.SECTION(HtmlStyle.detail, annotationDocTree);
}

10
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
View File

@ -37,6 +37,7 @@ import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.ConstructorWriter;
@ -122,9 +123,9 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
Content constructorDetailsTree = new ContentBuilder();
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.constructorDetailsLabel);
constructorDetailsTree.add(heading);
constructorDetailsTree.add(links.createAnchor(
SectionName.CONSTRUCTOR_DETAIL));
constructorDetailsTree.add(heading);
return constructorDetailsTree;
}
@ -137,12 +138,11 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
String erasureAnchor;
Content constructorDocTree = new ContentBuilder();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
heading.add(name(constructor));
constructorDocTree.add(heading);
if ((erasureAnchor = getErasureAnchor(constructor)) != null) {
constructorDocTree.add(links.createAnchor((erasureAnchor)));
heading.add(links.createAnchor((erasureAnchor)));
}
constructorDocTree.add(links.createAnchor(writer.getAnchor(constructor)));
heading.add(links.createAnchor(writer.getAnchor(constructor), new StringContent(name(constructor))));
constructorDocTree.add(heading);
return HtmlTree.SECTION(HtmlStyle.detail, constructorDocTree);
}

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
View File

@ -33,6 +33,7 @@ import javax.lang.model.element.VariableElement;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.Content;
@ -91,9 +92,9 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
Content enumConstantsDetailsTree = new ContentBuilder();
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.enumConstantDetailLabel);
enumConstantsDetailsTree.add(heading);
enumConstantsDetailsTree.add(links.createAnchor(
SectionName.ENUM_CONSTANT_DETAIL));
enumConstantsDetailsTree.add(heading);
return enumConstantsDetailsTree;
}
@ -105,9 +106,8 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
Content enumConstantsDetailsTree) {
Content enumConstantsTree = new ContentBuilder();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
heading.add(name(enumConstant));
heading.add(links.createAnchor(name(enumConstant), new StringContent(name(enumConstant))));
enumConstantsTree.add(heading);
enumConstantsTree.add(links.createAnchor(name(enumConstant)));
return HtmlTree.SECTION(HtmlStyle.detail, enumConstantsTree);
}

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
View File

@ -96,9 +96,9 @@ public class FieldWriterImpl extends AbstractMemberWriter
Content fieldDetailsTree = new ContentBuilder();
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.fieldDetailsLabel);
fieldDetailsTree.add(heading);
fieldDetailsTree.add(links.createAnchor(
SectionName.FIELD_DETAIL));
fieldDetailsTree.add(heading);
return fieldDetailsTree;
}
@ -109,9 +109,8 @@ public class FieldWriterImpl extends AbstractMemberWriter
public Content getFieldDocTreeHeader(VariableElement field, Content fieldDetailsTree) {
Content fieldTree = new ContentBuilder();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
heading.add(name(field));
heading.add(links.createAnchor(name(field), new StringContent(name(field))));
fieldTree.add(heading);
fieldTree.add(links.createAnchor(name(field)));
return HtmlTree.SECTION(HtmlStyle.detail, fieldTree);
}

9
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
View File

@ -109,8 +109,8 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
Content methodDetailsTree = new ContentBuilder();
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.methodDetailLabel);
methodDetailsTree.add(heading);
methodDetailsTree.add(links.createAnchor(SectionName.METHOD_DETAIL));
methodDetailsTree.add(heading);
return methodDetailsTree;
}
@ -122,12 +122,11 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
String erasureAnchor;
Content methodDocTree = new ContentBuilder();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
heading.add(name(method));
methodDocTree.add(heading);
if ((erasureAnchor = getErasureAnchor(method)) != null) {
methodDocTree.add(links.createAnchor((erasureAnchor)));
heading.add(links.createAnchor((erasureAnchor)));
}
methodDocTree.add(links.createAnchor(writer.getAnchor(method)));
heading.add(links.createAnchor(writer.getAnchor(method), new StringContent(name(method))));
methodDocTree.add(heading);
return HtmlTree.SECTION(HtmlStyle.detail, methodDocTree);
}

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
View File

@ -89,8 +89,8 @@ public class PropertyWriterImpl extends AbstractMemberWriter
Content propertyDetailsTree = new ContentBuilder();
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.propertyDetailsLabel);
propertyDetailsTree.add(heading);
propertyDetailsTree.add(links.createAnchor(SectionName.PROPERTY_DETAIL));
propertyDetailsTree.add(heading);
return propertyDetailsTree;
}
@ -102,9 +102,9 @@ public class PropertyWriterImpl extends AbstractMemberWriter
Content propertyDetailsTree) {
Content propertyDocTree = new ContentBuilder();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
heading.add(utils.getPropertyLabel(name(property)));
heading.add(links.createAnchor(name(property),
new StringContent(utils.getPropertyLabel(name(property)))));
propertyDocTree.add(heading);
propertyDocTree.add(links.createAnchor(name(property)));
return HtmlTree.SECTION(HtmlStyle.detail, propertyDocTree);
}

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
View File

@ -100,7 +100,7 @@ public class Links {
* @return a content tree for the marker anchor
*/
public Content createAnchor(String name, Content content) {
return HtmlTree.A_ID(name, (content == null ? EMPTY_COMMENT : content));
return HtmlTree.A_ID(getName(name), (content == null ? EMPTY_COMMENT : content));
}
private static final Content EMPTY_COMMENT = new Comment(" ");

3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
View File

@ -574,8 +574,7 @@ td.colLast a {
div.memberSignature {
font-family:'DejaVu Sans Mono', monospace;
font-size:14px;
margin-top:6px;
margin-bottom:14px;
margin:14px 0;
white-space: pre-wrap;
}
div.memberSignature span.annotations {

12
test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 4973609 8015249 8025633 8026567 6469561 8071982 8162363 8182765
* @bug 4973609 8015249 8025633 8026567 6469561 8071982 8162363 8182765 8223364
* @summary Make sure that annotation types with 0 members does not have
* extra HR tags.
* @author jamieh
@ -61,10 +61,7 @@ public class TestAnnotationTypes extends JavadocTester {
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#DEFAULT_NAME\">DEFAULT_NAME</a></span>"
+ "</code></th>",
"<!-- ============ ANNOTATION TYPE FIELD DETAIL =========== -->",
"<h3>DEFAULT_NAME</h3>\n"
+ "<a id=\"DEFAULT_NAME\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"DEFAULT_NAME\">DEFAULT_NAME</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;"
+ "<span class=\"returnType\">java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\">DEFAULT_NAME</span></div>\n");
@ -87,10 +84,7 @@ public class TestAnnotationTypes extends JavadocTester {
"<ul class=\"blockList\">",
"<li class=\"blockList\">",
"<section class=\"detail\">",
"<h3>value</h3>",
"<a id=\"value()\">",
"<!-- -->",
"</a>",
"<h3><a id=\"value()\">value</a></h3>",
"<div class=\"memberSignature\"><span class=\"returnType\">int</span>"
+ "&nbsp;<span class=\"memberName\">value</span></div>");

8
test/langtools/jdk/javadoc/doclet/testHref/TestHref.java
View File

@ -57,13 +57,9 @@ public class TestHref extends JavadocTester {
//Member summary table link.
"href=\"#method(int,int,java.util.ArrayList)\"",
//Anchor test.
"<a id=\"method(int,int,java.util.ArrayList)\">\n"
+ "<!-- -->\n"
+ "</a>",
"<a id=\"method(int,int,java.util.ArrayList)\">",
//Backward compatibility anchor test."pkg/C1.html",
"<a id=\"method(int,int,java.util.ArrayList)\">\n"
+ "<!-- -->\n"
+ "</a>");
"<a id=\"method(int,int,java.util.ArrayList)\">");
checkOutput("pkg/C2.html", true,
//{@link} test.

54
test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
View File

@ -323,21 +323,21 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- -->\n"
+ "</a>\n"
+ "<h2>Method Summary</h2>",
"<section class=\"fieldDetails\">\n"
+ "<h2>Field Details</h2>\n"
"<section class=\"fieldDetails\">"
+ "<a id=\"field.detail\">\n"
+ "<!-- -->\n"
+ "</a>",
"<section class=\"constructorDetails\">\n"
+ "<h2>Constructor Details</h2>\n"
+ "</a>\n"
+ "<h2>Field Details</h2>\n",
"<section class=\"constructorDetails\">"
+ "<a id=\"constructor.detail\">\n"
+ "<!-- -->\n"
+ "</a>",
"<section class=\"methodDetails\">\n"
+ "<h2>Method Details</h2>\n"
+ "</a>\n"
+ "<h2>Constructor Details</h2>\n",
"<section class=\"methodDetails\">"
+ "<a id=\"method.detail\">\n"
+ "<!-- -->\n"
+ "</a>",
+ "</a>\n"
+ "<h2>Method Details</h2>\n",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
@ -367,16 +367,16 @@ public class TestHtmlVersion extends JavadocTester {
+ "<h2>Method Summary</h2>\n"
+ "<div class=\"memberSummary\">\n",
"<table aria-labelledby=\"t0\">",
"<section class=\"constantDetails\">\n"
+ "<h2>Enum Constant Details</h2>\n"
"<section class=\"constantDetails\">"
+ "<a id=\"enum.constant.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
"<section class=\"methodDetails\">\n"
+ "<h2>Method Details</h2>\n"
+ "</a>\n"
+ "<h2>Enum Constant Details</h2>\n",
"<section class=\"methodDetails\">"
+ "<a id=\"method.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
+ "</a>\n"
+ "<h2>Method Details</h2>\n",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
@ -400,11 +400,11 @@ public class TestHtmlVersion extends JavadocTester {
+ "<h2>Method Summary</h2>\n"
+ "<div class=\"memberSummary\">\n",
"<table aria-labelledby=\"t0\">\n",
"<section class=\"methodDetails\">\n"
+ "<h2>Method Details</h2>\n"
"<section class=\"methodDetails\">"
+ "<a id=\"method.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
+ "</a>\n"
+ "<h2>Method Details</h2>\n",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
@ -426,11 +426,11 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- -->\n"
+ "</a>\n"
+ "<h2>Constructor Summary</h2>",
"<section class=\"constructorDetails\">\n"
+ "<h2>Constructor Details</h2>\n"
"<section class=\"constructorDetails\">"
+ "<a id=\"constructor.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
+ "</a>\n"
+ "<h2>Constructor Details</h2>\n",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
@ -452,11 +452,11 @@ public class TestHtmlVersion extends JavadocTester {
+ "<!-- -->\n"
+ "</a>\n"
+ "<h2>Constructor Summary</h2>",
"<section class=\"constructorDetails\">\n"
+ "<h2>Constructor Details</h2>\n"
"<section class=\"constructorDetails\">"
+ "<a id=\"constructor.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
+ "</a>\n"
+ "<h2>Constructor Details</h2>\n",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
@ -484,11 +484,11 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>\n"
+ "<h2>Optional Element Summary</h2>\n"
+ "<div class=\"memberSummary\">\n<table>",
"<section class=\"memberDetails\">\n"
+ "<h2>Element Details</h2>\n"
"<section class=\"memberDetails\">"
+ "<a id=\"annotation.type.element.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n",
+ "</a>\n"
+ "<h2>Element Details</h2>",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");

10
test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
View File

@ -124,10 +124,7 @@ public class TestInterface extends JavadocTester {
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n");
checkOutput("pkg/ClassWithStaticMembers.html", true,
"<h3>f</h3>\n"
+ "<a id=\"f\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"f\">f</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>&nbsp;"
+ "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">f</span></div>\n"
+ "<div class=\"block\">A hider field</div>",
@ -139,10 +136,7 @@ public class TestInterface extends JavadocTester {
+ "<div class=\"block\">A hider method</div>\n"
+ "</td>\n",
"<h3>staticMethod</h3>\n"
+ "<a id=\"staticMethod()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"staticMethod()\">staticMethod</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">staticMethod</span>()</div>\n"
+ "<div class=\"block\"><span class=\"descfrmTypeLabel\">"

54
test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
View File

@ -89,25 +89,16 @@ public class TestJavaFX extends JavadocTester {
+ "<a href=\"#pausedProperty\">paused</a></span></code></th>\n"
+ "<td class=\"colLast\">\n"
+ "<div class=\"block\">Defines if paused.</div>",
"<h3>paused</h3>\n"
+ "<a id=\"pausedProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"pausedProperty\">paused</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">"
+ "C.BooleanProperty</a></span>&nbsp;<span class=\"memberName\">pausedProperty</span></div>\n"
+ "<div class=\"block\">Defines if paused. The second line.</div>",
"<h3>isPaused</h3>\n"
+ "<a id=\"isPaused()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"isPaused()\">isPaused</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">isPaused</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property paused.</div>",
"<h3>setPaused</h3>\n"
+ "<a id=\"setPaused(boolean)\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"setPaused(boolean)\">setPaused</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">setPaused</span>&#8203;"
+ "(<span class=\"arguments\">boolean&nbsp;value)</span></div>\n"
@ -117,10 +108,7 @@ public class TestJavaFX extends JavadocTester {
+ "<dd>Defines if paused. The second line.</dd>\n"
+ "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
+ "<dd>false</dd>",
"<h3>isPaused</h3>\n"
+ "<a id=\"isPaused()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"isPaused()\">isPaused</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">isPaused</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property paused.</div>\n"
@ -129,20 +117,14 @@ public class TestJavaFX extends JavadocTester {
+ "<dd>Defines if paused. The second line.</dd>\n"
+ "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
+ "<dd>false</dd>",
"<h3>rate</h3>\n"
+ "<a id=\"rateProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"rateProperty\">rate</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\"><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">"
+ "C.DoubleProperty</a></span>&nbsp;<span class=\"memberName\">rateProperty</span></div>\n"
+ "<div class=\"block\">Defines the direction/speed at which the "
+ "<code>Timeline</code> is expected to\n"
+ " be played. This is the second line.</div>",
"<h3>setRate</h3>\n"
+ "<a id=\"setRate(double)\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"setRate(double)\">setRate</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">setRate</span>&#8203;"
+ "(<span class=\"arguments\">double&nbsp;value)</span></div>\n"
@ -155,10 +137,7 @@ public class TestJavaFX extends JavadocTester {
+ "<dd>11</dd>\n"
+ "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
+ "<dd>JavaFX 8.0</dd>",
"<h3>getRate</h3>\n"
+ "<a id=\"getRate()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"getRate()\">getRate</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">getRate</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property rate.</div>\n"
@ -225,17 +204,14 @@ public class TestJavaFX extends JavadocTester {
"pkg2");
checkExit(Exit.OK);
checkOutput("pkg2/Test.html", true,
"<h2>Property Details</h2>\n"
+ "<a id=\"property.detail\">\n"
"<a id=\"property.detail\">\n"
+ "<!-- -->\n"
+ "</a>\n"
+ "<h2>Property Details</h2>\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
+ "<section class=\"detail\">\n"
+ "<h3>beta</h3>\n"
+ "<a id=\"betaProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
+ "<h3><a id=\"betaProperty\">beta</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">java.lang.Object</span>"
+ "&nbsp;<span class=\"memberName\">betaProperty</span></div>\n"
@ -243,10 +219,7 @@ public class TestJavaFX extends JavadocTester {
+ "</li>\n"
+ "<li class=\"blockList\">\n"
+ "<section class=\"detail\">\n"
+ "<h3>gamma</h3>\n"
+ "<a id=\"gammaProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
+ "<h3><a id=\"gammaProperty\">gamma</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">java.util.List&lt;java.lang.String&gt;</span>"
+ "&nbsp;<span class=\"memberName\">gammaProperty</span></div>\n"
@ -254,10 +227,7 @@ public class TestJavaFX extends JavadocTester {
+ "</li>\n"
+ "<li class=\"blockList\">\n"
+ "<section class=\"detail\">\n"
+ "<h3>delta</h3>\n"
+ "<a id=\"deltaProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
+ "<h3><a id=\"deltaProperty\">delta</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
+ "<span class=\"returnType\">java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;"
+ "</span>&nbsp;<span class=\"memberName\">deltaProperty</span></div>\n"

4
test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java
View File

@ -73,8 +73,6 @@ public class TestMemberSummary extends JavadocTester {
checkOutput("pkg2/A.html", true,
"<a id=\"f(java.lang.Object[])\">\n"
+ "<!-- -->\n"
+ "</a><a id=\"f(T[])\">\n"
+ "<!-- -->\n"
+ "</a>");
+ "</a><a id=\"f(T[])\">f</a>");
}
}

10
test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java
View File

@ -193,17 +193,11 @@ public class TestOptions extends JavadocTester {
"<pre>@Documented\npublic @interface <a href="
+ "\"../src-html/linksource/AnnotationTypeField.html#line.31\">"
+ "AnnotationTypeField</a></pre>",
"<h3>DEFAULT_NAME</h3>\n"
+ "<a id=\"DEFAULT_NAME\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"DEFAULT_NAME\">DEFAULT_NAME</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;"
+ "<span class=\"returnType\">java.lang.String</span>&nbsp;<span class=\"memberName\">"
+ "<a href=\"../src-html/linksource/AnnotationTypeField.html#line.32\">DEFAULT_NAME</a></span></div>",
"<h3>name</h3>\n"
+ "<a id=\"name()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
"<h3><a id=\"name()\">name</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span>&nbsp;"
+ "<span class=\"memberName\"><a href=\"../src-html/linksource/AnnotationTypeField.html#line.34\">"
+ "name</a></span></div>");

56
test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java
View File

@ -532,10 +532,10 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>",
"<h2>Element Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
"<h3>four</h3>");
"<h3><a id=\"one()\">one</a></h3>",
"<h3><a id=\"two()\">two</a></h3>",
"<h3><a id=\"three()\">three</a></h3>",
"<h3><a id=\"four()\">four</a></h3>");
checkOrder("pkg5/AnnoRequiredTest.html",
"<h2>Required Element Summary</h2>",
@ -544,10 +544,10 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>",
"<h2>Element Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
"<h3>four</h3>");
"<h3><a id=\"one()\">one</a></h3>",
"<h3><a id=\"two()\">two</a></h3>",
"<h3><a id=\"three()\">three</a></h3>",
"<h3><a id=\"four()\">four</a></h3>");
checkOrder("pkg5/CtorTest.html",
"<h2>Constructor Summary</h2>",
@ -568,10 +568,10 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#THREE\">THREE</a>",
"<a href=\"#TWO\">TWO</a>",
"<h2>Enum Constant Details</h2>",
"<h3>ONE</h3>",
"<h3>TWO</h3>",
"<h3>THREE</h3>",
"<h3>FOUR</h3>");
"<h3><a id=\"ONE\">ONE</a></h3>",
"<h3><a id=\"TWO\">TWO</a></h3>",
"<h3><a id=\"THREE\">THREE</a></h3>",
"<h3><a id=\"FOUR\">FOUR</a></h3>");
checkOrder("pkg5/FieldTest.html",
"<h2>Field Summary</h2>",
@ -580,10 +580,10 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#three\">three</a>",
"<a href=\"#two\">two</a>",
"<h2>Field Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
"<h3>four</h3>");
"<h3><a id=\"one\">one</a></h3>",
"<h3><a id=\"two\">two</a></h3>",
"<h3><a id=\"three\">three</a></h3>",
"<h3><a id=\"four\">four</a></h3>");
checkOrder("pkg5/IntfTest.html",
"<h2>Method Summary</h2>",
@ -592,10 +592,10 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>",
"<h2>Method Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
"<h3>four</h3>");
"<h3><a id=\"one()\">one</a></h3>",
"<h3><a id=\"two()\">two</a></h3>",
"<h3><a id=\"three()\">three</a></h3>",
"<h3><a id=\"four()\">four</a></h3>");
checkOrder("pkg5/MethodTest.html",
"<h2>Method Summary</h2>",
@ -604,10 +604,10 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#three()\">three</a>",
"<a href=\"#two()\">two</a>",
"<h2>Method Details</h2>",
"<h3>one</h3>",
"<h3>two</h3>",
"<h3>three</h3>",
"<h3>four</h3>");
"<h3><a id=\"one()\">one</a></h3>",
"<h3><a id=\"two()\">two</a></h3>",
"<h3><a id=\"three()\">three</a></h3>",
"<h3><a id=\"four()\">four</a></h3>");
checkOrder("pkg5/PropertyTest.html",
"<h2>Property Summary</h2>",
@ -616,10 +616,10 @@ public class TestOrdering extends JavadocTester {
"<a href=\"#threeProperty\">three</a>",
"<a href=\"#twoProperty\">two</a>",
"<h2>Property Details</h2>",
"<h3>oneProperty</h3>",
"<h3>twoProperty</h3>",
"<h3>threeProperty</h3>",
"<h3>fourProperty</h3>");
"<h3><a id=\"oneProperty()\">oneProperty</a></h3>",
"<h3><a id=\"twoProperty()\">twoProperty</a></h3>",
"<h3><a id=\"threeProperty()\">threeProperty</a></h3>",
"<h3><a id=\"fourProperty()\">fourProperty</a></h3>");
}
}

5
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestBadOverride.java
View File

@ -53,10 +53,7 @@ public class TestBadOverride extends JavadocTester {
checkOutput("pkg4/Foo.html", true,
"<section class=\"detail\">\n"
+ "<h3>toString</h3>\n"
+ "<a id=\"toString()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
+ "<h3><a id=\"toString()\">toString</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">toString</span>()</div>\n"
+ "<div class=\"block\">Why can't I do this ?</div>\n"

5
test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java
View File

@ -86,10 +86,7 @@ public class TestSummaryTag extends JavadocTester {
// make sure the second @summary's content is displayed correctly
checkOutput("p1/A.html", true,
"<section class=\"detail\">\n"
+ "<h3>m3</h3>\n"
+ "<a id=\"m3()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
+ "<h3><a id=\"m3()\">m3</a></h3>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
+ "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">m3</span>()</div>\n"
+ "<div class=\"block\">First sentence some text maybe second sentence.</div>\n"

4
test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
View File

@ -70,9 +70,7 @@ public class TestTypeParameters extends JavadocTester {
// Nested type parameters
checkOutput("pkg/C.html", true,
"<a id=\"formatDetails(java.util.Collection,java.util.Collection)\">\n"
+ "<!-- -->\n"
+ "</a>");
"<a id=\"formatDetails(java.util.Collection,java.util.Collection)\">");
}
@Test