8220002: Improve anchor definitions in generated files
Reviewed-by: jjg
This commit is contained in:
Hannes Wallnöfer
parent
8d307c1168
commit
631b4d2694
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets
formats/html
AbstractIndexWriter.javaAbstractMemberWriter.javaAnnotationTypeFieldWriterImpl.javaAnnotationTypeOptionalMemberWriterImpl.javaAnnotationTypeRequiredMemberWriterImpl.javaAnnotationTypeWriterImpl.javaClassUseWriter.javaConstantsSummaryWriterImpl.javaConstructorWriterImpl.javaDeprecatedListWriter.javaEnumConstantWriterImpl.javaFieldWriterImpl.javaMethodWriterImpl.javaModuleWriterImpl.javaNestedClassWriterImpl.javaPackageUseWriter.javaPackageWriterImpl.javaPropertyWriterImpl.javaSerializedFormWriterImpl.javaSourceToHTMLConverter.javaSubWriterHolderWriter.javaTagletWriterImpl.java
markup
toolkit
AnnotationTypeFieldWriter.javaAnnotationTypeRequiredMemberWriter.javaConstructorWriter.javaFieldWriter.javaMethodWriter.javaPropertyWriter.java
builders
AnnotationTypeFieldBuilder.javaAnnotationTypeRequiredMemberBuilder.javaConstructorBuilder.javaFieldBuilder.javaMethodBuilder.javaPropertyBuilder.java
util
test/langtools/jdk/javadoc/doclet
AccessSkipNav
constantValues
testAnchorNames
testAnnotationOptional
testAnnotationTypes
testConstructors
testDeprecatedDocs
testHeadings
testHiddenTag
testHref
testHtmlTableStyles
testHtmlTableTags
testHtmlTag
testHtmlVersion
testIndexInDocFiles
testIndexInPackageFiles
testIndexTaglet
testInterface
testJavaFX
testLinkToSerialForm
testMemberInheritance
testMemberSummary
testModules
testNavigation
testOptions
testOrdering
testOverriddenMethods
testPackageDescription
testRecordTypes
testSearch
testSummaryTag
testSystemPropertyTaglet
testTypeParams
testUseOption
testValueTag
@ -169,10 +169,10 @@ public class AbstractIndexWriter extends HtmlDocletWriter {
|
||||
|
||||
protected void addHeading(Character uc, Content contentTree) {
|
||||
String unicode = uc.toString();
|
||||
contentTree.add(getMarkerAnchorForIndex(unicode));
|
||||
Content headContent = new StringContent(unicode);
|
||||
Content heading = HtmlTree.HEADING(Headings.CONTENT_HEADING, false,
|
||||
HtmlTree heading = HtmlTree.HEADING(Headings.CONTENT_HEADING, false,
|
||||
HtmlStyle.title, headContent);
|
||||
heading.setId(getNameForIndex(unicode));
|
||||
contentTree.add(heading);
|
||||
}
|
||||
|
||||
@ -411,16 +411,6 @@ public class AbstractIndexWriter extends HtmlDocletWriter {
|
||||
false, contentTree);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the marker anchor which will be added to the index documentation tree.
|
||||
*
|
||||
* @param anchorNameForIndex the anchor name attribute for index page
|
||||
* @return a content tree for the marker anchor
|
||||
*/
|
||||
public Content getMarkerAnchorForIndex(String anchorNameForIndex) {
|
||||
return links.createAnchor(getNameForIndex(anchorNameForIndex));
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a valid HTML name for member index page.
|
||||
*
|
||||
|
||||
16
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
16
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
@ -152,22 +152,6 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter {
|
||||
*/
|
||||
public abstract void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree);
|
||||
|
||||
/**
|
||||
* Add the anchor for the summary section of the member.
|
||||
*
|
||||
* @param typeElement the TypeElement to be documented
|
||||
* @param memberTree the content tree to which the summary anchor will be added
|
||||
*/
|
||||
public abstract void addSummaryAnchor(TypeElement typeElement, Content memberTree);
|
||||
|
||||
/**
|
||||
* Add the anchor for the inherited summary section of the member.
|
||||
*
|
||||
* @param typeElement the TypeElement to be documented
|
||||
* @param inheritedTree the content tree to which the inherited summary anchor will be added
|
||||
*/
|
||||
public abstract void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree);
|
||||
|
||||
/**
|
||||
* Add the summary type for the member.
|
||||
*
|
||||
|
||||
@ -70,7 +70,7 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
|
||||
memberSummaryTree.add(
|
||||
MarkerComments.START_OF_ANNOTATION_TYPE_FIELD_SUMMARY);
|
||||
Content memberTree = new ContentBuilder();
|
||||
writer.addSummaryHeader(this, typeElement, memberTree);
|
||||
writer.addSummaryHeader(this, memberTree);
|
||||
return memberTree;
|
||||
}
|
||||
|
||||
@ -85,7 +85,8 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
|
||||
writer.addMemberTree(HtmlStyle.fieldSummary, memberSummaryTree, memberTree);
|
||||
writer.addMemberTree(HtmlStyle.fieldSummary,
|
||||
SectionName.ANNOTATION_TYPE_FIELD_SUMMARY, memberSummaryTree, memberTree);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -98,13 +99,11 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public Content getAnnotationDetailsTreeHeader(TypeElement typeElement) {
|
||||
public Content getAnnotationDetailsTreeHeader() {
|
||||
Content memberDetailsTree = new ContentBuilder();
|
||||
if (!writer.printedAnnotationFieldHeading) {
|
||||
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
|
||||
contents.fieldDetailsLabel);
|
||||
memberDetailsTree.add(links.createAnchor(
|
||||
SectionName.ANNOTATION_TYPE_FIELD_DETAIL));
|
||||
memberDetailsTree.add(heading);
|
||||
writer.printedAnnotationFieldHeading = true;
|
||||
}
|
||||
@ -114,13 +113,12 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public Content getAnnotationDocTreeHeader(Element member,
|
||||
Content annotationDetailsTree) {
|
||||
public Content getAnnotationDocTreeHeader(Element member) {
|
||||
Content annotationDocTree = new ContentBuilder();
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
|
||||
heading.add(links.createAnchor(name(member), new StringContent(name(member))));
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING,
|
||||
new StringContent(name(member)));
|
||||
annotationDocTree.add(heading);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, annotationDocTree);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, annotationDocTree).setId(name(member));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -160,7 +158,8 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
|
||||
Content annotationDetails = new ContentBuilder();
|
||||
annotationDetails.add(annotationDetailsTreeHeader);
|
||||
annotationDetails.add(annotationDetailsTree);
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.fieldDetails, annotationDetails));
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.fieldDetails, annotationDetails)
|
||||
.setId(SectionName.ANNOTATION_TYPE_FIELD_DETAIL.getName()));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -174,7 +173,7 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void addSummaryLabel(Content memberTree) {
|
||||
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
|
||||
HtmlTree label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
|
||||
contents.fieldSummaryLabel);
|
||||
memberTree.add(label);
|
||||
}
|
||||
@ -202,22 +201,6 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
|
||||
memberTree.add(links.createAnchor(
|
||||
SectionName.ANNOTATION_TYPE_FIELD_SUMMARY));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
||||
@ -72,7 +72,7 @@ public class AnnotationTypeOptionalMemberWriterImpl extends
|
||||
memberSummaryTree.add(
|
||||
MarkerComments.START_OF_ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY);
|
||||
Content memberTree = new ContentBuilder();
|
||||
writer.addSummaryHeader(this, typeElement, memberTree);
|
||||
writer.addSummaryHeader(this, memberTree);
|
||||
return memberTree;
|
||||
}
|
||||
|
||||
@ -81,7 +81,8 @@ public class AnnotationTypeOptionalMemberWriterImpl extends
|
||||
*/
|
||||
@Override
|
||||
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
|
||||
writer.addMemberTree(HtmlStyle.memberSummary, memberSummaryTree, memberTree);
|
||||
writer.addMemberTree(HtmlStyle.memberSummary,
|
||||
SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY, memberSummaryTree, memberTree);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -128,13 +129,4 @@ public class AnnotationTypeOptionalMemberWriterImpl extends
|
||||
return new TableHeader(contents.modifierAndTypeLabel,
|
||||
contents.annotationTypeOptionalMemberLabel, contents.descriptionLabel);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
|
||||
memberTree.add(links.createAnchor(
|
||||
SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY));
|
||||
}
|
||||
}
|
||||
|
||||
@ -71,7 +71,7 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
|
||||
memberSummaryTree.add(
|
||||
MarkerComments.START_OF_ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY);
|
||||
Content memberTree = new ContentBuilder();
|
||||
writer.addSummaryHeader(this, typeElement, memberTree);
|
||||
writer.addSummaryHeader(this, memberTree);
|
||||
return memberTree;
|
||||
}
|
||||
|
||||
@ -86,7 +86,8 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
|
||||
writer.addMemberTree(HtmlStyle.memberSummary, memberSummaryTree, memberTree);
|
||||
writer.addMemberTree(HtmlStyle.memberSummary,
|
||||
SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY, memberSummaryTree, memberTree);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -99,13 +100,11 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public Content getAnnotationDetailsTreeHeader(TypeElement te) {
|
||||
public Content getAnnotationDetailsTreeHeader() {
|
||||
Content memberDetailsTree = new ContentBuilder();
|
||||
if (!writer.printedAnnotationHeading) {
|
||||
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
|
||||
contents.annotationTypeDetailsLabel);
|
||||
memberDetailsTree.add(links.createAnchor(
|
||||
SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL));
|
||||
memberDetailsTree.add(heading);
|
||||
writer.printedAnnotationHeading = true;
|
||||
}
|
||||
@ -116,14 +115,14 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getAnnotationDocTreeHeader(Element member, Content annotationDetailsTree) {
|
||||
public Content getAnnotationDocTreeHeader(Element member) {
|
||||
String simpleName = name(member);
|
||||
Content annotationDocTree = new ContentBuilder();
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
|
||||
heading.add(links.createAnchor(
|
||||
simpleName + utils.signature((ExecutableElement) member), new StringContent(simpleName)));
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING,
|
||||
new StringContent(simpleName));
|
||||
annotationDocTree.add(heading);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, annotationDocTree);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, annotationDocTree)
|
||||
.setId(simpleName + utils.signature((ExecutableElement) member));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -175,7 +174,7 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void addSummaryLabel(Content memberTree) {
|
||||
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
|
||||
HtmlTree label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
|
||||
contents.annotateTypeRequiredMemberSummaryLabel);
|
||||
memberTree.add(label);
|
||||
}
|
||||
@ -210,20 +209,6 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
|
||||
memberTree.add(links.createAnchor(
|
||||
SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
||||
@ -248,4 +248,13 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter
|
||||
public TypeElement getAnnotationTypeElement() {
|
||||
return annotationType;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getMemberDetailsTree(Content contentTree) {
|
||||
return HtmlTree.SECTION(HtmlStyle.details, contentTree)
|
||||
.setId(SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL.getName());
|
||||
}
|
||||
}
|
||||
|
||||
@ -307,8 +307,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
|
||||
HtmlTree ul = new HtmlTree(HtmlTag.UL);
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
for (PackageElement pkg : pkgSet) {
|
||||
Content markerAnchor = links.createAnchor(getPackageAnchorName(pkg));
|
||||
HtmlTree htmlTree = HtmlTree.SECTION(HtmlStyle.detail, markerAnchor);
|
||||
HtmlTree htmlTree = HtmlTree.SECTION(HtmlStyle.detail).setId(getPackageAnchorName(pkg));
|
||||
Content link = contents.getContent("doclet.ClassUse_Uses.of.0.in.1",
|
||||
getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER,
|
||||
typeElement)),
|
||||
|
||||
@ -175,22 +175,24 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
|
||||
@Override
|
||||
public void addPackageName(PackageElement pkg, Content summariesTree, boolean first) {
|
||||
Content pkgNameContent;
|
||||
String anchorName;
|
||||
if (!first) {
|
||||
summariesTree.add(summaryTree);
|
||||
}
|
||||
if (pkg.isUnnamed()) {
|
||||
summariesTree.add(links.createAnchor(SectionName.UNNAMED_PACKAGE_ANCHOR));
|
||||
anchorName = SectionName.UNNAMED_PACKAGE_ANCHOR.getName();
|
||||
pkgNameContent = contents.defaultPackageLabel;
|
||||
} else {
|
||||
String parsedPackageName = utils.parsePackageName(pkg);
|
||||
summariesTree.add(links.createAnchor(parsedPackageName));
|
||||
anchorName = parsedPackageName;
|
||||
pkgNameContent = getPackageLabel(parsedPackageName);
|
||||
}
|
||||
Content headingContent = new StringContent(".*");
|
||||
Content heading = HtmlTree.HEADING(Headings.ConstantsSummary.PACKAGE_HEADING, true,
|
||||
pkgNameContent);
|
||||
heading.add(headingContent);
|
||||
summaryTree = HtmlTree.SECTION(HtmlStyle.constantsSummary, heading);
|
||||
summaryTree = HtmlTree.SECTION(HtmlStyle.constantsSummary, heading)
|
||||
.setId(links.getName(anchorName));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -253,11 +255,9 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
|
||||
* @return the type column of the constant table row
|
||||
*/
|
||||
private Content getTypeColumn(VariableElement member) {
|
||||
Content anchor = links.createAnchor(
|
||||
currentTypeElement.getQualifiedName() + "." + member.getSimpleName());
|
||||
Content typeContent = new ContentBuilder();
|
||||
typeContent.add(anchor);
|
||||
Content code = new HtmlTree(HtmlTag.CODE);
|
||||
String id = currentTypeElement.getQualifiedName() + "." + member.getSimpleName();
|
||||
Content code = new HtmlTree(HtmlTag.CODE).setId(id);
|
||||
for (Modifier mod : member.getModifiers()) {
|
||||
Content modifier = new StringContent(mod.toString());
|
||||
code.add(modifier);
|
||||
|
||||
40
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
40
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
@ -97,7 +97,7 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
|
||||
Content memberSummaryTree) {
|
||||
memberSummaryTree.add(MarkerComments.START_OF_CONSTRUCTOR_SUMMARY);
|
||||
Content memberTree = new ContentBuilder();
|
||||
writer.addSummaryHeader(this, typeElement, memberTree);
|
||||
writer.addSummaryHeader(this, memberTree);
|
||||
return memberTree;
|
||||
}
|
||||
|
||||
@ -106,21 +106,19 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
|
||||
*/
|
||||
@Override
|
||||
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
|
||||
writer.addMemberTree(HtmlStyle.constructorSummary, memberSummaryTree, memberTree);
|
||||
writer.addMemberTree(HtmlStyle.constructorSummary,
|
||||
SectionName.CONSTRUCTOR_SUMMARY, memberSummaryTree, memberTree);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getConstructorDetailsTreeHeader(TypeElement typeElement,
|
||||
Content memberDetailsTree) {
|
||||
public Content getConstructorDetailsTreeHeader(Content memberDetailsTree) {
|
||||
memberDetailsTree.add(MarkerComments.START_OF_CONSTRUCTOR_DETAILS);
|
||||
Content constructorDetailsTree = new ContentBuilder();
|
||||
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
|
||||
contents.constructorDetailsLabel);
|
||||
constructorDetailsTree.add(links.createAnchor(
|
||||
SectionName.CONSTRUCTOR_DETAIL));
|
||||
constructorDetailsTree.add(heading);
|
||||
return constructorDetailsTree;
|
||||
}
|
||||
@ -129,17 +127,17 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getConstructorDocTreeHeader(ExecutableElement constructor,
|
||||
Content constructorDetailsTree) {
|
||||
public Content getConstructorDocTreeHeader(ExecutableElement constructor) {
|
||||
String erasureAnchor;
|
||||
Content constructorDocTree = new ContentBuilder();
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
|
||||
HtmlTree heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING,
|
||||
new StringContent(name(constructor)));
|
||||
if ((erasureAnchor = getErasureAnchor(constructor)) != null) {
|
||||
heading.add(links.createAnchor((erasureAnchor)));
|
||||
heading.setId(erasureAnchor);
|
||||
}
|
||||
heading.add(links.createAnchor(writer.getAnchor(constructor), new StringContent(name(constructor))));
|
||||
constructorDocTree.add(heading);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, constructorDocTree);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, constructorDocTree)
|
||||
.setId(links.getName(writer.getAnchor(constructor)));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -183,7 +181,8 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
|
||||
@Override
|
||||
public Content getConstructorDetails(Content constructorDetailsTreeHeader, Content constructorDetailsTree) {
|
||||
Content constructorDetails = new ContentBuilder(constructorDetailsTreeHeader, constructorDetailsTree);
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.constructorDetails, constructorDetails));
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.constructorDetails, constructorDetails)
|
||||
.setId(SectionName.CONSTRUCTOR_DETAIL.getName()));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -248,21 +247,6 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
|
||||
.setColumnStyles(bodyRowStyles);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
|
||||
memberTree.add(links.createAnchor(SectionName.CONSTRUCTOR_SUMMARY));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
||||
20
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
20
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
@ -287,13 +287,12 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
|
||||
div.setStyle(HtmlStyle.contentContainer);
|
||||
for (DeprElementKind kind : DeprElementKind.values()) {
|
||||
if (deprapi.hasDocumentation(kind)) {
|
||||
addAnchor(deprapi, kind, div);
|
||||
memberTableSummary = resources.getText("doclet.Member_Table_Summary",
|
||||
resources.getText(getHeadingKey(kind)),
|
||||
resources.getText(getSummaryKey(kind)));
|
||||
TableHeader memberTableHeader = new TableHeader(
|
||||
contents.getContent(getHeaderKey(kind)), contents.descriptionLabel);
|
||||
addDeprecatedAPI(deprapi.getSet(kind),
|
||||
addDeprecatedAPI(deprapi.getSet(kind), getAnchorName(kind),
|
||||
getHeadingKey(kind), memberTableSummary, memberTableHeader, div);
|
||||
}
|
||||
}
|
||||
@ -346,19 +345,6 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
|
||||
return div;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the anchor.
|
||||
*
|
||||
* @param builder the deprecated list builder
|
||||
* @param kind the kind of list being documented
|
||||
* @param htmlTree the content tree to which the anchor will be added
|
||||
*/
|
||||
private void addAnchor(DeprecatedAPIListBuilder builder, DeprElementKind kind, Content htmlTree) {
|
||||
if (builder.hasDocumentation(kind)) {
|
||||
htmlTree.add(links.createAnchor(getAnchorName(kind)));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the header for the deprecated API Listing.
|
||||
*
|
||||
@ -379,18 +365,20 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
|
||||
* Add deprecated information to the documentation tree
|
||||
*
|
||||
* @param deprList list of deprecated API elements
|
||||
* @param id the id attribute of the table
|
||||
* @param headingKey the caption for the deprecated table
|
||||
* @param tableSummary the summary for the deprecated table
|
||||
* @param tableHeader table headers for the deprecated table
|
||||
* @param contentTree the content tree to which the deprecated table will be added
|
||||
*/
|
||||
protected void addDeprecatedAPI(SortedSet<Element> deprList, String headingKey,
|
||||
protected void addDeprecatedAPI(SortedSet<Element> deprList, String id, String headingKey,
|
||||
String tableSummary, TableHeader tableHeader, Content contentTree) {
|
||||
if (deprList.size() > 0) {
|
||||
Content caption = contents.getContent(headingKey);
|
||||
Table table = new Table(HtmlStyle.deprecatedSummary)
|
||||
.setCaption(caption)
|
||||
.setHeader(tableHeader)
|
||||
.setId(id)
|
||||
.setColumnStyles(HtmlStyle.colDeprecatedItemName, HtmlStyle.colLast);
|
||||
for (Element e : deprList) {
|
||||
Content link;
|
||||
|
||||
32
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
32
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
@ -67,7 +67,7 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
|
||||
Content memberSummaryTree) {
|
||||
memberSummaryTree.add(MarkerComments.START_OF_ENUM_CONSTANT_SUMMARY);
|
||||
Content memberTree = new ContentBuilder();
|
||||
writer.addSummaryHeader(this, typeElement, memberTree);
|
||||
writer.addSummaryHeader(this, memberTree);
|
||||
return memberTree;
|
||||
}
|
||||
|
||||
@ -76,7 +76,8 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
|
||||
*/
|
||||
@Override
|
||||
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
|
||||
writer.addMemberTree(HtmlStyle.constantsSummary, memberSummaryTree, memberTree);
|
||||
writer.addMemberTree(HtmlStyle.constantsSummary,
|
||||
SectionName.ENUM_CONSTANT_SUMMARY, memberSummaryTree, memberTree);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -89,8 +90,6 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
|
||||
Content enumConstantsDetailsTree = new ContentBuilder();
|
||||
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
|
||||
contents.enumConstantDetailLabel);
|
||||
enumConstantsDetailsTree.add(links.createAnchor(
|
||||
SectionName.ENUM_CONSTANT_DETAIL));
|
||||
enumConstantsDetailsTree.add(heading);
|
||||
return enumConstantsDetailsTree;
|
||||
}
|
||||
@ -102,10 +101,11 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
|
||||
public Content getEnumConstantsTreeHeader(VariableElement enumConstant,
|
||||
Content enumConstantsDetailsTree) {
|
||||
Content enumConstantsTree = new ContentBuilder();
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
|
||||
heading.add(links.createAnchor(name(enumConstant), new StringContent(name(enumConstant))));
|
||||
HtmlTree heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING,
|
||||
new StringContent(name(enumConstant)));
|
||||
enumConstantsTree.add(heading);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, enumConstantsTree);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, enumConstantsTree)
|
||||
.setId(name(enumConstant));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -150,7 +150,8 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
|
||||
Content enumConstantsDetailsTree) {
|
||||
Content enumConstantsDetails =
|
||||
new ContentBuilder(enumConstantsDetailsTreeHeader, enumConstantsDetailsTree);
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.constantDetails, enumConstantsDetails));
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.constantDetails, enumConstantsDetails)
|
||||
.setId(SectionName.ENUM_CONSTANT_DETAIL.getName()));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -190,21 +191,6 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
|
||||
memberTree.add(links.createAnchor(SectionName.ENUM_CONSTANT_SUMMARY));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
||||
@ -70,7 +70,7 @@ public class FieldWriterImpl extends AbstractMemberWriter
|
||||
Content memberSummaryTree) {
|
||||
memberSummaryTree.add(MarkerComments.START_OF_FIELD_SUMMARY);
|
||||
Content memberTree = new ContentBuilder();
|
||||
writer.addSummaryHeader(this, typeElement, memberTree);
|
||||
writer.addSummaryHeader(this, memberTree);
|
||||
return memberTree;
|
||||
}
|
||||
|
||||
@ -79,20 +79,19 @@ public class FieldWriterImpl extends AbstractMemberWriter
|
||||
*/
|
||||
@Override
|
||||
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
|
||||
writer.addMemberTree(HtmlStyle.fieldSummary, memberSummaryTree, memberTree);
|
||||
writer.addMemberTree(HtmlStyle.fieldSummary,
|
||||
SectionName.FIELD_SUMMARY, memberSummaryTree, memberTree);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getFieldDetailsTreeHeader(TypeElement typeElement, Content memberDetailsTree) {
|
||||
public Content getFieldDetailsTreeHeader(Content memberDetailsTree) {
|
||||
memberDetailsTree.add(MarkerComments.START_OF_FIELD_DETAILS);
|
||||
Content fieldDetailsTree = new ContentBuilder();
|
||||
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
|
||||
contents.fieldDetailsLabel);
|
||||
fieldDetailsTree.add(links.createAnchor(
|
||||
SectionName.FIELD_DETAIL));
|
||||
fieldDetailsTree.add(heading);
|
||||
return fieldDetailsTree;
|
||||
}
|
||||
@ -101,12 +100,12 @@ public class FieldWriterImpl extends AbstractMemberWriter
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getFieldDocTreeHeader(VariableElement field, Content fieldDetailsTree) {
|
||||
public Content getFieldDocTreeHeader(VariableElement field) {
|
||||
Content fieldTree = new ContentBuilder();
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
|
||||
heading.add(links.createAnchor(name(field), new StringContent(name(field))));
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING,
|
||||
new StringContent(name(field)));
|
||||
fieldTree.add(heading);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, fieldTree);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, fieldTree).setId(name(field));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -151,7 +150,8 @@ public class FieldWriterImpl extends AbstractMemberWriter
|
||||
@Override
|
||||
public Content getFieldDetails(Content fieldDetailsTreeHeader, Content fieldDetailsTree) {
|
||||
Content fieldDetails = new ContentBuilder(fieldDetailsTreeHeader, fieldDetailsTree);
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.fieldDetails, fieldDetails));
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.fieldDetails, fieldDetails)
|
||||
.setId(SectionName.FIELD_DETAIL.getName()));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -193,24 +193,6 @@ public class FieldWriterImpl extends AbstractMemberWriter
|
||||
.setColumnStyles(bodyRowStyles);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
|
||||
memberTree.add(links.createAnchor(
|
||||
SectionName.FIELD_SUMMARY));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
|
||||
inheritedTree.add(links.createAnchor(
|
||||
SectionName.FIELDS_INHERITANCE, configuration.getClassName(typeElement)));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@ -228,8 +210,10 @@ public class FieldWriterImpl extends AbstractMemberWriter
|
||||
? resources.getText("doclet.Fields_Inherited_From_Class")
|
||||
: resources.getText("doclet.Fields_Inherited_From_Interface"));
|
||||
}
|
||||
Content labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
|
||||
HtmlTree labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
|
||||
label);
|
||||
labelHeading.setId(SectionName.FIELDS_INHERITANCE.getName()
|
||||
+ links.getName(configuration.getClassName(typeElement)));
|
||||
labelHeading.add(Entity.NO_BREAK_SPACE);
|
||||
labelHeading.add(classLink);
|
||||
inheritedTree.add(labelHeading);
|
||||
|
||||
@ -83,7 +83,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
|
||||
public Content getMemberSummaryHeader(TypeElement typeElement, Content memberSummaryTree) {
|
||||
memberSummaryTree.add(MarkerComments.START_OF_METHOD_SUMMARY);
|
||||
Content memberTree = new ContentBuilder();
|
||||
writer.addSummaryHeader(this, typeElement, memberTree);
|
||||
writer.addSummaryHeader(this, memberTree);
|
||||
return memberTree;
|
||||
}
|
||||
|
||||
@ -92,19 +92,19 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
|
||||
*/
|
||||
@Override
|
||||
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
|
||||
writer.addMemberTree(HtmlStyle.methodSummary, memberSummaryTree, memberTree);
|
||||
writer.addMemberTree(HtmlStyle.methodSummary,
|
||||
SectionName.METHOD_SUMMARY, memberSummaryTree, memberTree);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getMethodDetailsTreeHeader(TypeElement typeElement, Content memberDetailsTree) {
|
||||
public Content getMethodDetailsTreeHeader(Content memberDetailsTree) {
|
||||
memberDetailsTree.add(MarkerComments.START_OF_METHOD_DETAILS);
|
||||
Content methodDetailsTree = new ContentBuilder();
|
||||
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
|
||||
contents.methodDetailLabel);
|
||||
methodDetailsTree.add(links.createAnchor(SectionName.METHOD_DETAIL));
|
||||
methodDetailsTree.add(heading);
|
||||
return methodDetailsTree;
|
||||
}
|
||||
@ -113,16 +113,17 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getMethodDocTreeHeader(ExecutableElement method, Content methodDetailsTree) {
|
||||
public Content getMethodDocTreeHeader(ExecutableElement method) {
|
||||
String erasureAnchor;
|
||||
Content methodDocTree = new ContentBuilder();
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
|
||||
HtmlTree heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING,
|
||||
new StringContent(name(method)));
|
||||
if ((erasureAnchor = getErasureAnchor(method)) != null) {
|
||||
heading.add(links.createAnchor((erasureAnchor)));
|
||||
heading.setId(erasureAnchor);
|
||||
}
|
||||
heading.add(links.createAnchor(writer.getAnchor(method), new StringContent(name(method))));
|
||||
methodDocTree.add(heading);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, methodDocTree);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, methodDocTree)
|
||||
.setId(links.getName(writer.getAnchor(method)));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -195,7 +196,8 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
|
||||
@Override
|
||||
public Content getMethodDetails(Content methodDetailsTreeHeader, Content methodDetailsTree) {
|
||||
Content methodDetails = new ContentBuilder(methodDetailsTreeHeader, methodDetailsTree);
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.methodDetails, methodDetails));
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.methodDetails, methodDetails)
|
||||
.setId(SectionName.METHOD_DETAIL.getName()));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -243,23 +245,6 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
|
||||
.setTabScript(i -> "show(" + i + ");");
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
|
||||
memberTree.add(links.createAnchor(SectionName.METHOD_SUMMARY));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
|
||||
inheritedTree.add(links.createAnchor(
|
||||
SectionName.METHODS_INHERITANCE, configuration.getClassName(typeElement)));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@ -277,8 +262,10 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
|
||||
? resources.getText("doclet.Methods_Inherited_From_Class")
|
||||
: resources.getText("doclet.Methods_Inherited_From_Interface"));
|
||||
}
|
||||
Content labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
|
||||
HtmlTree labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
|
||||
label);
|
||||
labelHeading.setId(SectionName.METHODS_INHERITANCE.getName()
|
||||
+ links.getName(configuration.getClassName(typeElement)));
|
||||
labelHeading.add(Entity.NO_BREAK_SPACE);
|
||||
labelHeading.add(classLink);
|
||||
inheritedTree.add(labelHeading);
|
||||
@ -330,9 +317,9 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
|
||||
writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType));
|
||||
Content codeOverriddenTypeLink = HtmlTree.CODE(overriddenTypeLink);
|
||||
Content methlink = writer.getLink(
|
||||
new LinkInfoImpl(writer.configuration, LinkInfoImpl.Kind.MEMBER,
|
||||
holder)
|
||||
.where(writer.links.getName(writer.getAnchor(method))).label(method.getSimpleName()));
|
||||
new LinkInfoImpl(writer.configuration, LinkInfoImpl.Kind.MEMBER, holder)
|
||||
.where(writer.links.getName(writer.getAnchor(method)))
|
||||
.label(method.getSimpleName()));
|
||||
Content codeMethLink = HtmlTree.CODE(methlink);
|
||||
Content dd = HtmlTree.DD(codeMethLink);
|
||||
dd.add(Entity.NO_BREAK_SPACE);
|
||||
|
||||
@ -442,14 +442,12 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
|
||||
* Add the summary header.
|
||||
*
|
||||
* @param startMarker the marker comment
|
||||
* @param markerAnchor the marker anchor for the section
|
||||
* @param heading the heading for the section
|
||||
* @param htmltree the content tree to which the information is added
|
||||
*/
|
||||
public void addSummaryHeader(Content startMarker, SectionName markerAnchor, Content heading,
|
||||
public void addSummaryHeader(Content startMarker, Content heading,
|
||||
Content htmltree) {
|
||||
htmltree.add(startMarker);
|
||||
htmltree.add(links.createAnchor(markerAnchor));
|
||||
htmltree.add(HtmlTree.HEADING(Headings.ModuleDeclaration.SUMMARY_HEADING, heading));
|
||||
}
|
||||
|
||||
@ -496,9 +494,9 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
|
||||
TableHeader requiresTableHeader =
|
||||
new TableHeader(contents.modifierLabel, contents.moduleLabel,
|
||||
contents.descriptionLabel);
|
||||
HtmlTree section = HtmlTree.SECTION(HtmlStyle.modulesSummary);
|
||||
addSummaryHeader(MarkerComments.START_OF_MODULES_SUMMARY, SectionName.MODULES,
|
||||
contents.navModules, section);
|
||||
HtmlTree section = HtmlTree.SECTION(HtmlStyle.modulesSummary)
|
||||
.setId(SectionName.MODULES.getName());
|
||||
addSummaryHeader(MarkerComments.START_OF_MODULES_SUMMARY, contents.navModules, section);
|
||||
if (display(requires)) {
|
||||
String text = resources.getText("doclet.Requires_Summary");
|
||||
String tableSummary = resources.getText("doclet.Member_Table_Summary",
|
||||
@ -546,9 +544,9 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
|
||||
public void addPackagesSummary(Content summaryContentTree) {
|
||||
if (display(packages)
|
||||
|| display(indirectPackages) || display(indirectOpenPackages)) {
|
||||
HtmlTree section = HtmlTree.SECTION(HtmlStyle.packagesSummary);
|
||||
addSummaryHeader(MarkerComments.START_OF_PACKAGES_SUMMARY, SectionName.PACKAGES,
|
||||
contents.navPackages, section);
|
||||
HtmlTree section = HtmlTree.SECTION(HtmlStyle.packagesSummary)
|
||||
.setId(SectionName.PACKAGES.getName());;
|
||||
addSummaryHeader(MarkerComments.START_OF_PACKAGES_SUMMARY, contents.navPackages, section);
|
||||
if (display(packages)) {
|
||||
addPackageSummary(section);
|
||||
}
|
||||
@ -723,9 +721,9 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
|
||||
boolean haveProvides = displayServices(provides.keySet(), providesTrees);
|
||||
|
||||
if (haveProvides || haveUses) {
|
||||
HtmlTree section = HtmlTree.SECTION(HtmlStyle.servicesSummary);
|
||||
addSummaryHeader(MarkerComments.START_OF_SERVICES_SUMMARY, SectionName.SERVICES,
|
||||
contents.navServices, section);
|
||||
HtmlTree section = HtmlTree.SECTION(HtmlStyle.servicesSummary)
|
||||
.setId(SectionName.SERVICES.getName());
|
||||
addSummaryHeader(MarkerComments.START_OF_SERVICES_SUMMARY, contents.navServices, section);
|
||||
TableHeader usesProvidesTableHeader =
|
||||
new TableHeader(contents.typeLabel, contents.descriptionLabel);
|
||||
if (haveProvides) {
|
||||
@ -850,10 +848,10 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
|
||||
@Override
|
||||
public void addModuleDescription(Content moduleContentTree) {
|
||||
if (!utils.getFullBody(mdle).isEmpty()) {
|
||||
Content tree = HtmlTree.SECTION(HtmlStyle.moduleDescription);
|
||||
HtmlTree tree = HtmlTree.SECTION(HtmlStyle.moduleDescription);
|
||||
tree.setId(SectionName.MODULE_DESCRIPTION.getName());
|
||||
addDeprecationInfo(tree);
|
||||
tree.add(MarkerComments.START_OF_MODULE_DESCRIPTION);
|
||||
tree.add(links.createAnchor(SectionName.MODULE_DESCRIPTION));
|
||||
addInlineComment(mdle, tree);
|
||||
moduleContentTree.add(tree);
|
||||
}
|
||||
|
||||
28
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
28
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
@ -68,7 +68,7 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
|
||||
Content memberSummaryTree) {
|
||||
memberSummaryTree.add(MarkerComments.START_OF_NESTED_CLASS_SUMMARY);
|
||||
Content memberTree = new ContentBuilder();
|
||||
writer.addSummaryHeader(this, typeElement, memberTree);
|
||||
writer.addSummaryHeader(this, memberTree);
|
||||
return memberTree;
|
||||
}
|
||||
|
||||
@ -77,7 +77,8 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
|
||||
*/
|
||||
@Override
|
||||
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
|
||||
writer.addMemberTree(HtmlStyle.nestedClassSummary, memberSummaryTree, memberTree);
|
||||
writer.addMemberTree(HtmlStyle.nestedClassSummary,
|
||||
SectionName.NESTED_CLASS_SUMMARY, memberSummaryTree, memberTree);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -113,25 +114,6 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
|
||||
.setColumnStyles(bodyRowStyles);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
|
||||
memberTree.add(links.createAnchor(
|
||||
SectionName.NESTED_CLASS_SUMMARY));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
|
||||
inheritedTree.add(links.createAnchor(
|
||||
SectionName.NESTED_CLASSES_INHERITANCE,
|
||||
utils.getFullyQualifiedName(typeElement)));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@ -149,7 +131,9 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
|
||||
? resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Interface")
|
||||
: resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Class"));
|
||||
}
|
||||
Content labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING, label);
|
||||
HtmlTree labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING, label);
|
||||
labelHeading.setId(SectionName.NESTED_CLASSES_INHERITANCE.getName()
|
||||
+ links.getName(utils.getFullyQualifiedName(typeElement)));
|
||||
labelHeading.add(Entity.NO_BREAK_SPACE);
|
||||
labelHeading.add(classLink);
|
||||
inheritedTree.add(labelHeading);
|
||||
|
||||
@ -198,8 +198,8 @@ public class PackageUseWriter extends SubWriterHolderWriter {
|
||||
ul.setStyle(HtmlStyle.blockList);
|
||||
for (String packageName : usingPackageToUsedClasses.keySet()) {
|
||||
PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
|
||||
HtmlTree section = HtmlTree.SECTION(HtmlStyle.detail);
|
||||
section.add(links.createAnchor(getPackageAnchorName(usingPackage)));
|
||||
HtmlTree section = HtmlTree.SECTION(HtmlStyle.detail)
|
||||
.setId(getPackageAnchorName(usingPackage));
|
||||
String tableSummary = resources.getText("doclet.Use_Table_Summary",
|
||||
resources.getText("doclet.classes"));
|
||||
Content caption = contents.getContent(
|
||||
|
||||
@ -278,8 +278,8 @@ public class PackageWriterImpl extends HtmlDocletWriter
|
||||
@Override
|
||||
public void addPackageDescription(Content packageContentTree) {
|
||||
if (!utils.getBody(packageElement).isEmpty()) {
|
||||
Content tree = sectionTree;
|
||||
tree.add(links.createAnchor(SectionName.PACKAGE_DESCRIPTION));
|
||||
HtmlTree tree = sectionTree;
|
||||
tree.setId(SectionName.PACKAGE_DESCRIPTION.getName());
|
||||
addDeprecationInfo(tree);
|
||||
addInlineComment(packageElement, tree);
|
||||
}
|
||||
|
||||
@ -62,7 +62,7 @@ public class PropertyWriterImpl extends AbstractMemberWriter
|
||||
public Content getMemberSummaryHeader(TypeElement typeElement, Content memberSummaryTree) {
|
||||
memberSummaryTree.add(MarkerComments.START_OF_PROPERTY_SUMMARY);
|
||||
Content memberTree = new ContentBuilder();
|
||||
writer.addSummaryHeader(this, typeElement, memberTree);
|
||||
writer.addSummaryHeader(this, memberTree);
|
||||
return memberTree;
|
||||
}
|
||||
|
||||
@ -71,20 +71,19 @@ public class PropertyWriterImpl extends AbstractMemberWriter
|
||||
*/
|
||||
@Override
|
||||
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
|
||||
writer.addMemberTree(HtmlStyle.propertySummary, memberSummaryTree, memberTree);
|
||||
writer.addMemberTree(HtmlStyle.propertySummary,
|
||||
SectionName.PROPERTY_SUMMARY, memberSummaryTree, memberTree);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getPropertyDetailsTreeHeader(TypeElement typeElement,
|
||||
Content memberDetailsTree) {
|
||||
public Content getPropertyDetailsTreeHeader(Content memberDetailsTree) {
|
||||
memberDetailsTree.add(MarkerComments.START_OF_PROPERTY_DETAILS);
|
||||
Content propertyDetailsTree = new ContentBuilder();
|
||||
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
|
||||
contents.propertyDetailsLabel);
|
||||
propertyDetailsTree.add(links.createAnchor(SectionName.PROPERTY_DETAIL));
|
||||
propertyDetailsTree.add(heading);
|
||||
return propertyDetailsTree;
|
||||
}
|
||||
@ -93,14 +92,13 @@ public class PropertyWriterImpl extends AbstractMemberWriter
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public Content getPropertyDocTreeHeader(ExecutableElement property,
|
||||
Content propertyDetailsTree) {
|
||||
public Content getPropertyDocTreeHeader(ExecutableElement property) {
|
||||
Content propertyDocTree = new ContentBuilder();
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
|
||||
heading.add(links.createAnchor(name(property),
|
||||
new StringContent(utils.getPropertyLabel(name(property)))));
|
||||
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING,
|
||||
new StringContent(utils.getPropertyLabel(name(property))));
|
||||
propertyDocTree.add(heading);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, propertyDocTree);
|
||||
return HtmlTree.SECTION(HtmlStyle.detail, propertyDocTree)
|
||||
.setId(name(property));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -164,7 +162,8 @@ public class PropertyWriterImpl extends AbstractMemberWriter
|
||||
@Override
|
||||
public Content getPropertyDetails(Content propertyDetailsTreeHeader, Content propertyDetailsTree) {
|
||||
Content propertyDetails = new ContentBuilder(propertyDetailsTreeHeader, propertyDetailsTree);
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.propertyDetails, propertyDetails));
|
||||
return getMemberTree(HtmlTree.SECTION(HtmlStyle.propertyDetails, propertyDetails)
|
||||
.setId(SectionName.PROPERTY_DETAIL.getName()));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -206,24 +205,6 @@ public class PropertyWriterImpl extends AbstractMemberWriter
|
||||
.setRowScopeColumn(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
|
||||
memberTree.add(links.createAnchor(SectionName.PROPERTY_SUMMARY));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
|
||||
inheritedTree.add(links.createAnchor(
|
||||
SectionName.PROPERTIES_INHERITANCE,
|
||||
configuration.getClassName(typeElement)));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@ -241,8 +222,10 @@ public class PropertyWriterImpl extends AbstractMemberWriter
|
||||
? resources.getText("doclet.Properties_Inherited_From_Class")
|
||||
: resources.getText("doclet.Properties_Inherited_From_Interface"));
|
||||
}
|
||||
Content labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
|
||||
HtmlTree labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
|
||||
label);
|
||||
labelHeading.setId(SectionName.PROPERTIES_INHERITANCE.getName()
|
||||
+ links.getName(configuration.getClassName(typeElement)));
|
||||
labelHeading.add(Entity.NO_BREAK_SPACE);
|
||||
labelHeading.add(classLink);
|
||||
inheritedTree.add(labelHeading);
|
||||
|
||||
@ -153,8 +153,8 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
|
||||
? getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.DEFAULT, typeElement)
|
||||
.label(configuration.getClassName(typeElement)))
|
||||
: new StringContent(utils.getFullyQualifiedName(typeElement));
|
||||
Content section = HtmlTree.SECTION(HtmlStyle.serializedClassDetails, links.createAnchor(
|
||||
utils.getFullyQualifiedName(typeElement)));
|
||||
Content section = HtmlTree.SECTION(HtmlStyle.serializedClassDetails)
|
||||
.setId(utils.getFullyQualifiedName(typeElement));
|
||||
Content superClassLink = typeElement.getSuperclass() != null
|
||||
? getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.SERIALIZED_FORM,
|
||||
typeElement.getSuperclass()))
|
||||
|
||||
2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
@ -320,7 +320,7 @@ public class SourceToHTMLConverter {
|
||||
*/
|
||||
private void addLine(Content pre, String line, int currentLineNo) {
|
||||
if (line != null) {
|
||||
Content anchor = HtmlTree.A_ID(
|
||||
Content anchor = HtmlTree.SPAN_ID(
|
||||
"line." + Integer.toString(currentLineNo),
|
||||
new StringContent(utils.replaceTabs(line)));
|
||||
pre.add(anchor);
|
||||
|
||||
14
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
14
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
@ -69,12 +69,9 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
|
||||
* Add the summary header.
|
||||
*
|
||||
* @param mw the writer for the member being documented
|
||||
* @param typeElement the type element to be documented
|
||||
* @param memberTree the content tree to which the summary header will be added
|
||||
*/
|
||||
public void addSummaryHeader(AbstractMemberWriter mw, TypeElement typeElement,
|
||||
Content memberTree) {
|
||||
mw.addSummaryAnchor(typeElement, memberTree);
|
||||
public void addSummaryHeader(AbstractMemberWriter mw, Content memberTree) {
|
||||
mw.addSummaryLabel(memberTree);
|
||||
}
|
||||
|
||||
@ -88,7 +85,6 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
|
||||
public void addInheritedSummaryHeader(AbstractMemberWriter mw, TypeElement typeElement,
|
||||
Content inheritedTree) {
|
||||
mw.addInheritedSummaryLabel(typeElement, inheritedTree);
|
||||
mw.addInheritedSummaryAnchor(typeElement, inheritedTree);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -221,13 +217,15 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds the member tree with css style.
|
||||
* Adds the member tree with css style and id attribute.
|
||||
* @param style the css style to be applied to member tree
|
||||
* @param sectionName the section name to use for the section id attribute
|
||||
* @param memberSummaryTree the content tree representing the member summary
|
||||
* @param memberTree the content tree representing the member
|
||||
*/
|
||||
public void addMemberTree(HtmlStyle style, Content memberSummaryTree, Content memberTree) {
|
||||
HtmlTree htmlTree = HtmlTree.SECTION(style, memberTree);
|
||||
public void addMemberTree(HtmlStyle style, SectionName sectionName, Content memberSummaryTree, Content memberTree) {
|
||||
HtmlTree htmlTree = HtmlTree.SECTION(style, memberTree)
|
||||
.setId(sectionName.getName());
|
||||
memberSummaryTree.add(getMemberTree(htmlTree));
|
||||
}
|
||||
|
||||
|
||||
@ -200,7 +200,7 @@ public class TagletWriterImpl extends TagletWriter {
|
||||
boolean defineID = (element.getKind() == ElementKind.RECORD)
|
||||
&& (paramTag instanceof ParamTree) && !((ParamTree) paramTag).isTypeParameter();
|
||||
Content nameTree = new StringContent(paramName);
|
||||
body.add(HtmlTree.CODE(defineID ? HtmlTree.A_ID("param-" + paramName, nameTree) : nameTree));
|
||||
body.add(HtmlTree.CODE(defineID ? HtmlTree.SPAN_ID("param-" + paramName, nameTree) : nameTree));
|
||||
body.add(" - ");
|
||||
List<? extends DocTree> description = ch.getDescription(configuration, paramTag);
|
||||
body.add(htmlWriter.commentTagsToContent(paramTag, element, description, false, inSummary));
|
||||
@ -427,7 +427,7 @@ public class TagletWriterImpl extends TagletWriter {
|
||||
if (count > 0) {
|
||||
anchorName += "-" + count;
|
||||
}
|
||||
result = HtmlTree.A_ID(HtmlStyle.searchTagResult, anchorName, new StringContent(tagText));
|
||||
result = HtmlTree.SPAN(anchorName, HtmlStyle.searchTagResult, new StringContent(tagText));
|
||||
if (configuration.createindex && !tagText.isEmpty()) {
|
||||
SearchIndexItem si = new SearchIndexItem();
|
||||
si.setSystemProperty(isSystemProperty);
|
||||
|
||||
@ -102,6 +102,17 @@ public class HtmlTree extends Content {
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the "id" attribute for this tag.
|
||||
*
|
||||
* @param id the value for the id attribute
|
||||
* @return this object
|
||||
*/
|
||||
public HtmlTree setId(String id) {
|
||||
put(HtmlAttr.ID, id);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the "title" attribute for this tag.
|
||||
* Any HTML tags in the content will be removed.
|
||||
@ -267,35 +278,6 @@ public class HtmlTree extends Content {
|
||||
return htmltree;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates an HTML anchor tag with id attribute and a body.
|
||||
*
|
||||
* @param id id for the anchor tag
|
||||
* @param body body for the anchor tag
|
||||
* @return an HtmlTree object
|
||||
*/
|
||||
public static HtmlTree A_ID(String id, Content body) {
|
||||
HtmlTree htmltree = new HtmlTree(HtmlTag.A);
|
||||
htmltree.put(HtmlAttr.ID, nullCheck(id));
|
||||
htmltree.add(nullCheck(body));
|
||||
return htmltree;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates an HTML anchor tag with a style class, id attribute and a body.
|
||||
*
|
||||
* @param styleClass stylesheet class for the tag
|
||||
* @param id id for the anchor tag
|
||||
* @param body body for the anchor tag
|
||||
* @return an HtmlTree object
|
||||
*/
|
||||
public static HtmlTree A_ID(HtmlStyle styleClass, String id, Content body) {
|
||||
HtmlTree htmltree = A_ID(id, body);
|
||||
if (styleClass != null)
|
||||
htmltree.setStyle(styleClass);
|
||||
return htmltree;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a CAPTION tag with some content.
|
||||
*
|
||||
@ -732,6 +714,19 @@ public class HtmlTree extends Content {
|
||||
return htmltree;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates an SPAN tag with id attribute and a body.
|
||||
*
|
||||
* @param id id for the tag
|
||||
* @param body body for the tag
|
||||
* @return an HtmlTree object for the SPAN tag
|
||||
*/
|
||||
public static HtmlTree SPAN_ID(String id, Content body) {
|
||||
HtmlTree htmltree = new HtmlTree(HtmlTag.SPAN, nullCheck(body));
|
||||
htmltree.put(HtmlAttr.ID, nullCheck(id));
|
||||
return htmltree;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a SPAN tag with id and style class attributes. It also encloses
|
||||
* a content.
|
||||
@ -946,6 +941,8 @@ public class HtmlTree extends Content {
|
||||
case SCRIPT :
|
||||
return ((hasAttr(HtmlAttr.TYPE) && hasAttr(HtmlAttr.SRC) && !hasContent()) ||
|
||||
(hasAttr(HtmlAttr.TYPE) && hasContent()));
|
||||
case SPAN :
|
||||
return (hasAttr(HtmlAttr.ID) || hasContent());
|
||||
default :
|
||||
return hasContent();
|
||||
}
|
||||
|
||||
@ -60,51 +60,6 @@ public class Links {
|
||||
this.file = file;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an anchor of the form {@code <a id="name"><!-- --></a>}.
|
||||
*
|
||||
* @param name the value for the {@code id} or {@code name} attribute
|
||||
* @return a content tree for the anchor
|
||||
*/
|
||||
public Content createAnchor(String name) {
|
||||
return createAnchor(getName(name), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an anchor of the form {@code <a id="sectionName"><!-- --></a>}.
|
||||
*
|
||||
* @param sectionName the value for the {@code id} or {@code name} attribute
|
||||
* @return a content tree for the anchor
|
||||
*/
|
||||
public Content createAnchor(SectionName sectionName) {
|
||||
return createAnchor(sectionName.getName(), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an anchor of the form {@code <a id="sectionNameName"><!-- --></a>}.
|
||||
*
|
||||
* @param sectionName the first part of the value for the {@code id} or {@code name} attribute
|
||||
* @param name the second part of the value for the {@code id} or {@code name} attribute
|
||||
* @return a content tree for the anchor
|
||||
*/
|
||||
public Content createAnchor(SectionName sectionName, String name) {
|
||||
return createAnchor(sectionName.getName() + getName(name), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an anchor of the form {@code <a id="anchorName">content</a>}.
|
||||
*
|
||||
* @param name the value for the {@code id} or {@code name} attribute
|
||||
* @param content the content that should be added to the anchor,
|
||||
* or null, to use an empty comment
|
||||
* @return a content tree for the marker anchor
|
||||
*/
|
||||
public Content createAnchor(String name, Content content) {
|
||||
return HtmlTree.A_ID(getName(name), (content == null ? EMPTY_COMMENT : content));
|
||||
}
|
||||
|
||||
private static final Content EMPTY_COMMENT = new Comment(" ");
|
||||
|
||||
/**
|
||||
* Creates a link of the form {@code <a href="#where">label</a>}.
|
||||
*
|
||||
|
||||
@ -24,12 +24,9 @@
|
||||
*/
|
||||
package jdk.javadoc.internal.doclets.formats.html.markup;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Deque;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.SortedSet;
|
||||
|
||||
@ -79,12 +76,13 @@ public class Navigation {
|
||||
private boolean displaySummaryModulesLink;
|
||||
private boolean displaySummaryPackagesLink;
|
||||
private boolean displaySummaryServicesLink;
|
||||
private final Map<Position, Deque<Content>> topBottomNavContents;
|
||||
private Content userHeader;
|
||||
private Content userFooter;
|
||||
private final String rowListTitle;
|
||||
private final Content searchLabel;
|
||||
|
||||
private static final Content EMPTY_COMMENT = new Comment(" ");
|
||||
|
||||
public enum PageMode {
|
||||
ALLCLASSES,
|
||||
ALLPACKAGES,
|
||||
@ -141,41 +139,8 @@ public class Navigation {
|
||||
this.path = path;
|
||||
this.pathToRoot = path.parent().invert();
|
||||
this.links = new Links(path);
|
||||
this.topBottomNavContents = new HashMap<>();
|
||||
this.rowListTitle = configuration.getResources().getText("doclet.Navigation");
|
||||
this.searchLabel = contents.getContent("doclet.search");
|
||||
populateNavContents(Position.TOP);
|
||||
populateNavContents(Position.BOTTOM);
|
||||
}
|
||||
|
||||
/**
|
||||
* Populate the navigation contents for top and bottom navigation
|
||||
*
|
||||
* @param position the position of the navigation bar on the page
|
||||
*/
|
||||
private void populateNavContents(Position position) {
|
||||
Deque<Content> queue = new ArrayDeque<>();
|
||||
Content skipNavLinks = contents.getContent("doclet.Skip_navigation_links");
|
||||
switch (position) {
|
||||
case TOP:
|
||||
queue.addLast(links.createAnchor(SectionName.NAVBAR_TOP));
|
||||
queue.addLast(links.createLink(SectionName.SKIP_NAVBAR_TOP, skipNavLinks,
|
||||
skipNavLinks.toString(), ""));
|
||||
queue.addLast(links.createAnchor(SectionName.NAVBAR_TOP_FIRSTROW));
|
||||
queue.addLast(links.createAnchor(SectionName.SKIP_NAVBAR_TOP));
|
||||
topBottomNavContents.put(position, queue);
|
||||
break;
|
||||
case BOTTOM:
|
||||
queue.addLast(links.createAnchor(SectionName.NAVBAR_BOTTOM));
|
||||
queue.addLast(links.createLink(SectionName.SKIP_NAVBAR_BOTTOM, skipNavLinks,
|
||||
skipNavLinks.toString(), ""));
|
||||
queue.addLast(links.createAnchor(SectionName.NAVBAR_BOTTOM_FIRSTROW));
|
||||
queue.addLast(links.createAnchor(SectionName.SKIP_NAVBAR_BOTTOM));
|
||||
topBottomNavContents.put(position, queue);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public Navigation setNavLinkModule(Content navLinkModule) {
|
||||
@ -946,23 +911,27 @@ public class Navigation {
|
||||
if (configuration.nonavbar) {
|
||||
return new ContentBuilder();
|
||||
}
|
||||
Deque<Content> queue;
|
||||
Content tree = HtmlTree.NAV();
|
||||
HtmlTree navDiv = new HtmlTree(HtmlTag.DIV);
|
||||
Content skipNavLinks = contents.getContent("doclet.Skip_navigation_links");
|
||||
if (top) {
|
||||
queue = topBottomNavContents.get(Position.TOP);
|
||||
tree.add(Position.TOP.startOfNav());
|
||||
navDiv.setStyle(HtmlStyle.topNav);
|
||||
navDiv.setStyle(HtmlStyle.topNav)
|
||||
.setId(SectionName.NAVBAR_TOP.getName())
|
||||
.add(HtmlTree.DIV(HtmlStyle.skipNav,
|
||||
links.createLink(SectionName.SKIP_NAVBAR_TOP, skipNavLinks,
|
||||
skipNavLinks.toString(), "")));
|
||||
} else {
|
||||
queue = topBottomNavContents.get(Position.BOTTOM);
|
||||
tree.add(Position.BOTTOM.startOfNav());
|
||||
navDiv.setStyle(HtmlStyle.bottomNav);
|
||||
navDiv.setStyle(HtmlStyle.bottomNav)
|
||||
.setId(SectionName.NAVBAR_BOTTOM.getName())
|
||||
.add(HtmlTree.DIV(HtmlStyle.skipNav,
|
||||
links.createLink(SectionName.SKIP_NAVBAR_BOTTOM, skipNavLinks,
|
||||
skipNavLinks.toString(), "")));
|
||||
}
|
||||
navDiv.add(queue.poll());
|
||||
HtmlTree skipLinkDiv = HtmlTree.DIV(HtmlStyle.skipNav, queue.poll());
|
||||
navDiv.add(skipLinkDiv);
|
||||
navDiv.add(queue.poll());
|
||||
HtmlTree navList = new HtmlTree(HtmlTag.UL);
|
||||
navList.setId(top ? SectionName.NAVBAR_TOP_FIRSTROW.getName()
|
||||
: SectionName.NAVBAR_BOTTOM_FIRSTROW.getName());
|
||||
navList.setStyle(HtmlStyle.navList);
|
||||
navList.put(HtmlAttr.TITLE, rowListTitle);
|
||||
addMainNavLinks(navList);
|
||||
@ -990,10 +959,12 @@ public class Navigation {
|
||||
tree.add(subDiv);
|
||||
if (top) {
|
||||
tree.add(Position.TOP.endOfNav());
|
||||
tree.add(HtmlTree.DIV(HtmlStyle.skipNav, queue.poll()));
|
||||
tree.add(HtmlTree.SPAN(HtmlStyle.skipNav, EMPTY_COMMENT)
|
||||
.setId(SectionName.SKIP_NAVBAR_TOP.getName()));
|
||||
} else {
|
||||
tree.add(queue.poll());
|
||||
tree.add(Position.BOTTOM.endOfNav());
|
||||
tree.add(HtmlTree.SPAN(HtmlStyle.skipNav, EMPTY_COMMENT)
|
||||
.setId(SectionName.SKIP_NAVBAR_BOTTOM.getName()));
|
||||
}
|
||||
return tree;
|
||||
}
|
||||
|
||||
@ -77,6 +77,7 @@ public class Table {
|
||||
private final List<Content> bodyRows;
|
||||
private final List<Integer> bodyRowMasks;
|
||||
private String rowIdPrefix = "i";
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* Creates a builder for an HTML table.
|
||||
@ -276,6 +277,17 @@ public class Table {
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the id attribute of the table.
|
||||
*
|
||||
* @param id the id
|
||||
* @return this object
|
||||
*/
|
||||
public Table setId(String id) {
|
||||
this.id = id;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a row of data to the table.
|
||||
* Each item of content should be suitable for use as the content of a
|
||||
@ -396,6 +408,9 @@ public class Table {
|
||||
public Content toContent() {
|
||||
HtmlTree mainDiv = new HtmlTree(HtmlTag.DIV);
|
||||
mainDiv.setStyle(tableStyle);
|
||||
if (id != null) {
|
||||
mainDiv.setId(id);
|
||||
}
|
||||
HtmlTree table = new HtmlTree(HtmlTag.TABLE);
|
||||
if (tabMap == null || tabs.size() == 1) {
|
||||
if (tabMap == null) {
|
||||
|
||||
@ -56,18 +56,17 @@ public interface AnnotationTypeFieldWriter {
|
||||
/**
|
||||
* Add the annotation type details tree header.
|
||||
*
|
||||
* @param typeElement the annotation type being documented
|
||||
* @return content tree for the annotation details header
|
||||
*/
|
||||
Content getAnnotationDetailsTreeHeader(TypeElement typeElement);
|
||||
Content getAnnotationDetailsTreeHeader();
|
||||
|
||||
/**
|
||||
* Get the annotation type documentation tree header.
|
||||
*
|
||||
* @param member the annotation type being documented
|
||||
* @param annotationDetailsTree the content tree representing annotation type details
|
||||
* @return content tree for the annotation type documentation header
|
||||
*/
|
||||
Content getAnnotationDocTreeHeader(Element member, Content annotationDetailsTree);
|
||||
Content getAnnotationDocTreeHeader(Element member);
|
||||
|
||||
/**
|
||||
* Get the annotation type details tree.
|
||||
|
||||
@ -56,18 +56,17 @@ public interface AnnotationTypeRequiredMemberWriter {
|
||||
/**
|
||||
* Add the annotation type details tree header.
|
||||
*
|
||||
* @param typeElement the annotation type being documented
|
||||
* @return content tree for the annotation details header
|
||||
*/
|
||||
Content getAnnotationDetailsTreeHeader(TypeElement typeElement);
|
||||
Content getAnnotationDetailsTreeHeader();
|
||||
|
||||
/**
|
||||
* Get the annotation type documentation tree header.
|
||||
*
|
||||
* @param member the annotation type being documented
|
||||
* @param annotationDetailsTree the content tree representing annotation type details
|
||||
* @return content tree for the annotation type documentation header
|
||||
*/
|
||||
Content getAnnotationDocTreeHeader(Element member, Content annotationDetailsTree);
|
||||
Content getAnnotationDocTreeHeader(Element member);
|
||||
|
||||
/**
|
||||
* Get the annotation type details tree.
|
||||
|
||||
@ -42,22 +42,18 @@ public interface ConstructorWriter {
|
||||
/**
|
||||
* Get the constructor details tree header.
|
||||
*
|
||||
* @param typeElement the class being documented
|
||||
* @param memberDetailsTree the content tree representing member details
|
||||
* @return content tree for the constructor details header
|
||||
*/
|
||||
Content getConstructorDetailsTreeHeader(TypeElement typeElement,
|
||||
Content memberDetailsTree);
|
||||
Content getConstructorDetailsTreeHeader(Content memberDetailsTree);
|
||||
|
||||
/**
|
||||
* Get the constructor documentation tree header.
|
||||
*
|
||||
* @param constructor the constructor being documented
|
||||
* @param constructorDetailsTree the content tree representing constructor details
|
||||
* @return content tree for the constructor documentation header
|
||||
*/
|
||||
Content getConstructorDocTreeHeader(ExecutableElement constructor,
|
||||
Content constructorDetailsTree);
|
||||
Content getConstructorDocTreeHeader(ExecutableElement constructor);
|
||||
|
||||
/**
|
||||
* Get the signature for the given constructor.
|
||||
|
||||
@ -43,20 +43,18 @@ public interface FieldWriter {
|
||||
/**
|
||||
* Get the field details tree header.
|
||||
*
|
||||
* @param typeElement the class being documented
|
||||
* @param memberDetailsTree the content tree representing member details
|
||||
* @return content tree for the field details header
|
||||
*/
|
||||
Content getFieldDetailsTreeHeader(TypeElement typeElement, Content memberDetailsTree);
|
||||
Content getFieldDetailsTreeHeader(Content memberDetailsTree);
|
||||
|
||||
/**
|
||||
* Get the field documentation tree header.
|
||||
*
|
||||
* @param field the constructor being documented
|
||||
* @param fieldDetailsTree the content tree representing field details
|
||||
* @return content tree for the field documentation header
|
||||
*/
|
||||
Content getFieldDocTreeHeader(VariableElement field, Content fieldDetailsTree);
|
||||
Content getFieldDocTreeHeader(VariableElement field);
|
||||
|
||||
/**
|
||||
* Get the signature for the given field.
|
||||
|
||||
@ -43,20 +43,18 @@ public interface MethodWriter {
|
||||
/**
|
||||
* Get the method details tree header.
|
||||
*
|
||||
* @param typeElement the class being documented
|
||||
* @param memberDetailsTree the content tree representing member details
|
||||
* @return content tree for the method details header
|
||||
*/
|
||||
Content getMethodDetailsTreeHeader(TypeElement typeElement, Content memberDetailsTree);
|
||||
Content getMethodDetailsTreeHeader(Content memberDetailsTree);
|
||||
|
||||
/**
|
||||
* Get the method documentation tree header.
|
||||
*
|
||||
* @param method the method being documented
|
||||
* @param methodDetailsTree the content tree representing method details
|
||||
* @return content tree for the method documentation header
|
||||
*/
|
||||
Content getMethodDocTreeHeader(ExecutableElement method, Content methodDetailsTree);
|
||||
Content getMethodDocTreeHeader(ExecutableElement method);
|
||||
|
||||
/**
|
||||
* Get the signature for the given method.
|
||||
|
||||
@ -42,22 +42,18 @@ public interface PropertyWriter {
|
||||
/**
|
||||
* Get the property details tree header.
|
||||
*
|
||||
* @param typeElement the class being documented
|
||||
* @param memberDetailsTree the content tree representing member details
|
||||
* @return content tree for the property details header
|
||||
*/
|
||||
Content getPropertyDetailsTreeHeader(TypeElement typeElement,
|
||||
Content memberDetailsTree);
|
||||
Content getPropertyDetailsTreeHeader(Content memberDetailsTree);
|
||||
|
||||
/**
|
||||
* Get the property documentation tree header.
|
||||
*
|
||||
* @param property the property being documented
|
||||
* @param propertyDetailsTree the content tree representing property details
|
||||
* @return content tree for the property documentation header
|
||||
*/
|
||||
Content getPropertyDocTreeHeader(ExecutableElement property,
|
||||
Content propertyDetailsTree);
|
||||
Content getPropertyDocTreeHeader(ExecutableElement property);
|
||||
|
||||
/**
|
||||
* Get the signature for the given property.
|
||||
|
||||
@ -137,13 +137,12 @@ public class AnnotationTypeFieldBuilder extends AbstractMemberBuilder {
|
||||
}
|
||||
if (hasMembersToDocument()) {
|
||||
writer.addAnnotationFieldDetailsMarker(memberDetailsTree);
|
||||
Content annotationDetailsTreeHeader = writer.getAnnotationDetailsTreeHeader(typeElement);
|
||||
Content annotationDetailsTreeHeader = writer.getAnnotationDetailsTreeHeader();
|
||||
Content detailsTree = writer.getMemberTreeHeader();
|
||||
|
||||
for (Element member : members) {
|
||||
currentMember = member;
|
||||
Content annotationDocTree = writer.getAnnotationDocTreeHeader(currentMember,
|
||||
detailsTree);
|
||||
Content annotationDocTree = writer.getAnnotationDocTreeHeader(currentMember);
|
||||
|
||||
buildSignature(annotationDocTree);
|
||||
buildDeprecationInfo(annotationDocTree);
|
||||
|
||||
@ -139,13 +139,12 @@ public class AnnotationTypeRequiredMemberBuilder extends AbstractMemberBuilder {
|
||||
}
|
||||
if (hasMembersToDocument()) {
|
||||
writer.addAnnotationDetailsMarker(memberDetailsTree);
|
||||
Content annotationDetailsTreeHeader = writer.getAnnotationDetailsTreeHeader(typeElement);
|
||||
Content annotationDetailsTreeHeader = writer.getAnnotationDetailsTreeHeader();
|
||||
Content detailsTree = writer.getMemberTreeHeader();
|
||||
|
||||
for (Element member : members) {
|
||||
currentMember = member;
|
||||
Content annotationDocTree = writer.getAnnotationDocTreeHeader(
|
||||
currentMember, detailsTree);
|
||||
Content annotationDocTree = writer.getAnnotationDocTreeHeader(currentMember);
|
||||
|
||||
buildAnnotationTypeMemberChildren(annotationDocTree);
|
||||
|
||||
|
||||
5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java
@ -132,13 +132,12 @@ public class ConstructorBuilder extends AbstractMemberBuilder {
|
||||
return;
|
||||
}
|
||||
if (hasMembersToDocument()) {
|
||||
Content constructorDetailsTreeHeader = writer.getConstructorDetailsTreeHeader(typeElement,
|
||||
memberDetailsTree);
|
||||
Content constructorDetailsTreeHeader = writer.getConstructorDetailsTreeHeader(memberDetailsTree);
|
||||
Content constructorDetailsTree = writer.getMemberTreeHeader();
|
||||
|
||||
for (Element constructor : constructors) {
|
||||
currentConstructor = (ExecutableElement)constructor;
|
||||
Content constructorDocTree = writer.getConstructorDocTreeHeader(currentConstructor, constructorDetailsTree);
|
||||
Content constructorDocTree = writer.getConstructorDocTreeHeader(currentConstructor);
|
||||
|
||||
buildSignature(constructorDocTree);
|
||||
buildDeprecationInfo(constructorDocTree);
|
||||
|
||||
@ -122,12 +122,12 @@ public class FieldBuilder extends AbstractMemberBuilder {
|
||||
return;
|
||||
}
|
||||
if (!fields.isEmpty()) {
|
||||
Content fieldDetailsTreeHeader = writer.getFieldDetailsTreeHeader(typeElement, memberDetailsTree);
|
||||
Content fieldDetailsTreeHeader = writer.getFieldDetailsTreeHeader(memberDetailsTree);
|
||||
Content fieldDetailsTree = writer.getMemberTreeHeader();
|
||||
|
||||
for (Element element : fields) {
|
||||
currentElement = (VariableElement)element;
|
||||
Content fieldDocTree = writer.getFieldDocTreeHeader(currentElement, fieldDetailsTree);
|
||||
Content fieldDocTree = writer.getFieldDocTreeHeader(currentElement);
|
||||
|
||||
buildSignature(fieldDocTree);
|
||||
buildDeprecationInfo(fieldDocTree);
|
||||
|
||||
@ -123,13 +123,12 @@ public class MethodBuilder extends AbstractMemberBuilder {
|
||||
return;
|
||||
}
|
||||
if (hasMembersToDocument()) {
|
||||
Content methodDetailsTreeHeader = writer.getMethodDetailsTreeHeader(typeElement,
|
||||
memberDetailsTree);
|
||||
Content methodDetailsTreeHeader = writer.getMethodDetailsTreeHeader(memberDetailsTree);
|
||||
Content methodDetailsTree = writer.getMemberTreeHeader();
|
||||
|
||||
for (Element method : methods) {
|
||||
currentMethod = (ExecutableElement)method;
|
||||
Content methodDocTree = writer.getMethodDocTreeHeader(currentMethod, methodDetailsTree);
|
||||
Content methodDocTree = writer.getMethodDocTreeHeader(currentMethod);
|
||||
|
||||
buildSignature(methodDocTree);
|
||||
buildDeprecationInfo(methodDocTree);
|
||||
|
||||
@ -122,14 +122,12 @@ public class PropertyBuilder extends AbstractMemberBuilder {
|
||||
return;
|
||||
}
|
||||
if (hasMembersToDocument()) {
|
||||
Content propertyDetailsTreeHeader = writer.getPropertyDetailsTreeHeader(typeElement,
|
||||
memberDetailsTree);
|
||||
Content propertyDetailsTreeHeader = writer.getPropertyDetailsTreeHeader(memberDetailsTree);
|
||||
Content propertyDetailsTree = writer.getMemberTreeHeader();
|
||||
|
||||
for (Element property : properties) {
|
||||
currentProperty = (ExecutableElement)property;
|
||||
Content propertyDocTree = writer.getPropertyDocTreeHeader(currentProperty,
|
||||
propertyDetailsTree);
|
||||
Content propertyDocTree = writer.getPropertyDocTreeHeader(currentProperty);
|
||||
|
||||
buildSignature(propertyDocTree);
|
||||
buildPropertyComments(propertyDocTree);
|
||||
|
||||
@ -192,7 +192,7 @@ public class DeprecatedAPIListBuilder {
|
||||
/**
|
||||
* Return true if the list of a given type has size greater than 0.
|
||||
*
|
||||
* @param type the type of list being checked.
|
||||
* @param kind the type of list being checked.
|
||||
*/
|
||||
public boolean hasDocumentation(DeprElementKind kind) {
|
||||
return !deprecatedMap.get(kind).isEmpty();
|
||||
|
||||
@ -51,15 +51,15 @@ public class AccessSkipNav extends JavadocTester {
|
||||
checkOutput("p1/C1.html", true,
|
||||
// Top navbar <a href>
|
||||
"<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a>",
|
||||
// Top navbar <a name>
|
||||
"<a id=\"skip.navbar.top\">\n"
|
||||
// Top navbar <span id>
|
||||
"<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
+ "</span>",
|
||||
// Bottom navbar <a href>
|
||||
"<a href=\"#skip.navbar.bottom\" title=\"Skip navigation links\">Skip navigation links</a>",
|
||||
// Bottom navbar <a name>
|
||||
"<a id=\"skip.navbar.bottom\">\n"
|
||||
// Bottom navbar <span id>
|
||||
"<span class=\"skipNav\" id=\"skip.navbar.bottom\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>");
|
||||
+ "</span>");
|
||||
}
|
||||
}
|
||||
|
||||
@ -53,29 +53,29 @@ public class TestConstantValuesDriver extends JavadocTester {
|
||||
"TEST3PASSES",
|
||||
"TEST4PASSES",
|
||||
"<code>\"<Hello World>\"</code>",
|
||||
"</a><code>public static final byte</code></td>\n" +
|
||||
"<code id=\"TestConstantValues.BYTE_MAX_VALUE\">public static final byte</code></td>\n" +
|
||||
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MAX_VALUE\">" +
|
||||
"BYTE_MAX_VALUE</a></code></th>\n" +
|
||||
"<td class=\"colLast\"><code>127</code></td>",
|
||||
"</a><code>public static final byte</code></td>\n" +
|
||||
"<code id=\"TestConstantValues.BYTE_MIN_VALUE\">public static final byte</code></td>\n" +
|
||||
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MIN_VALUE\">" +
|
||||
"BYTE_MIN_VALUE</a></code></th>\n" +
|
||||
"<td class=\"colLast\"><code>-127</code></td>",
|
||||
"</a><code>public static final char</code></td>\n" +
|
||||
"<code id=\"TestConstantValues.CHAR_MAX_VALUE\">public static final char</code></td>\n" +
|
||||
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#CHAR_MAX_VALUE\">" +
|
||||
"CHAR_MAX_VALUE</a></code></th>\n" +
|
||||
"<td class=\"colLast\"><code>65535</code></td>",
|
||||
"</a><code>public static final double</code></td>",
|
||||
"<code id=\"TestConstantValues.DOUBLE_MAX_VALUE\">public static final double</code></td>",
|
||||
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MAX_VALUE\">" +
|
||||
"DOUBLE_MAX_VALUE</a></code></th>\n" +
|
||||
"<td class=\"colLast\"><code>1.7976931348623157E308</code></td>",
|
||||
"</a><code>public static final double</code></td>\n" +
|
||||
"<code id=\"TestConstantValues.DOUBLE_MIN_VALUE\">public static final double</code></td>\n" +
|
||||
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MIN_VALUE\">" +
|
||||
"DOUBLE_MIN_VALUE</a></code></th>",
|
||||
"</a><code>public static final boolean</code></td>\n" +
|
||||
"<code id=\"TestConstantValues.GOODBYE\">public static final boolean</code></td>\n" +
|
||||
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#GOODBYE\">" +
|
||||
"GOODBYE</a></code></th>",
|
||||
"</a><code>public static final boolean</code></td>\n" +
|
||||
"<code id=\"TestConstantValues.HELLO\">public static final boolean</code></td>\n" +
|
||||
"<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#HELLO\">HELLO</a></code></th>\n" +
|
||||
"<td class=\"colLast\"><code>true</code></td>"
|
||||
);
|
||||
|
||||
@ -61,15 +61,19 @@ public class TestAnchorNames extends JavadocTester {
|
||||
|
||||
// Test some section markers and links to these markers
|
||||
checkOutput("pkg1/RegClass.html", true,
|
||||
"<a id=\"skip.navbar.top\">",
|
||||
"<span class=\"skipNav\" id=\"skip.navbar.top\">",
|
||||
"<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">",
|
||||
"<a id=\"nested.class.summary\">",
|
||||
"<section class=\"nestedClassSummary\" id=\"nested.class.summary\">\n"
|
||||
+ "<h2>Nested Class Summary</h2>",
|
||||
"<a href=\"#nested.class.summary\">",
|
||||
"<a id=\"method.summary\">",
|
||||
"<section class=\"methodSummary\" id=\"method.summary\">\n"
|
||||
+ "<h2>Method Summary</h2>",
|
||||
"<a href=\"#method.summary\">",
|
||||
"<a id=\"field.detail\">",
|
||||
"<section class=\"fieldDetails\" id=\"field.detail\">\n"
|
||||
+ "<h2>Field Details</h2>",
|
||||
"<a href=\"#field.detail\">",
|
||||
"<a id=\"constructor.detail\">",
|
||||
"<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
|
||||
+ "<h2>Constructor Details</h2>",
|
||||
"<a href=\"#constructor.detail\">");
|
||||
|
||||
// Test some members and link to these members
|
||||
@ -80,59 +84,59 @@ public class TestAnchorNames extends JavadocTester {
|
||||
|
||||
// Test some fields
|
||||
checkOutput("pkg1/RegClass.html", true,
|
||||
"<a id=\"_\">",
|
||||
"<section class=\"detail\" id=\"_\">",
|
||||
"<a href=\"#_\">",
|
||||
"<a id=\"_$\">",
|
||||
"<section class=\"detail\" id=\"_$\">",
|
||||
"<a href=\"#_$\">",
|
||||
"<a id=\"$_\">",
|
||||
"<section class=\"detail\" id=\"$_\">",
|
||||
"<a href=\"#$_\">",
|
||||
"<a id=\"$field\">",
|
||||
"<section class=\"detail\" id=\"$field\">",
|
||||
"<a href=\"#$field\">",
|
||||
"<a id=\"fieldInCla$$\">",
|
||||
"<section class=\"detail\" id=\"fieldInCla$$\">",
|
||||
"<a href=\"#fieldInCla$$\">",
|
||||
"<a id=\"S_$$$$$INT\">",
|
||||
"<section class=\"detail\" id=\"S_$$$$$INT\">",
|
||||
"<a href=\"#S_$$$$$INT\">",
|
||||
"<a id=\"method$$\">",
|
||||
"<section class=\"detail\" id=\"method$$\">",
|
||||
"<a href=\"#method$$\">");
|
||||
|
||||
checkOutput("pkg1/DeprMemClass.html", true,
|
||||
"<a id=\"_field_In_Class\">",
|
||||
"<section class=\"detail\" id=\"_field_In_Class\">",
|
||||
"<a href=\"#_field_In_Class\">");
|
||||
|
||||
// Test constructor
|
||||
checkOutput("pkg1/RegClass.html", true,
|
||||
"<a id=\"<init>(java.lang.String,int)\">",
|
||||
"<section class=\"detail\" id=\"<init>(java.lang.String,int)\">",
|
||||
"<a href=\"#%3Cinit%3E(java.lang.String,int)\">");
|
||||
|
||||
// Test some methods
|
||||
checkOutput("pkg1/RegClass.html", true,
|
||||
"<a id=\"_methodInClass(java.lang.String)\">",
|
||||
"<section class=\"detail\" id=\"_methodInClass(java.lang.String)\">",
|
||||
"<a href=\"#_methodInClass(java.lang.String)\">",
|
||||
"<a id=\"method()\">",
|
||||
"<section class=\"detail\" id=\"method()\">",
|
||||
"<a href=\"#method()\">",
|
||||
"<a id=\"foo(java.util.Map)\">",
|
||||
"<section class=\"detail\" id=\"foo(java.util.Map)\">",
|
||||
"<a href=\"#foo(java.util.Map)\">",
|
||||
"<a id=\"methodInCla$s(java.lang.String[])\">",
|
||||
"<section class=\"detail\" id=\"methodInCla$s(java.lang.String[])\">",
|
||||
"<a href=\"#methodInCla$s(java.lang.String%5B%5D)\">",
|
||||
"<a id=\"_methodInClas$(java.lang.String,int)\">",
|
||||
"<section class=\"detail\" id=\"_methodInClas$(java.lang.String,int)\">",
|
||||
"<a href=\"#_methodInClas$(java.lang.String,int)\">",
|
||||
"<a id=\"methodD(pkg1.RegClass.$A)\">",
|
||||
"<section class=\"detail\" id=\"methodD(pkg1.RegClass.$A)\">",
|
||||
"<a href=\"#methodD(pkg1.RegClass.$A)\">",
|
||||
"<a id=\"methodD(pkg1.RegClass.D[])\">",
|
||||
"<section class=\"detail\" id=\"methodD(pkg1.RegClass.D[])\">",
|
||||
"<a href=\"#methodD(pkg1.RegClass.D%5B%5D)\">");
|
||||
|
||||
checkOutput("pkg1/DeprMemClass.html", true,
|
||||
"<a id=\"$method_In_Class()\">",
|
||||
"<section class=\"detail\" id=\"$method_In_Class()\">",
|
||||
"<a href=\"#$method_In_Class()\">");
|
||||
|
||||
// Test enum
|
||||
checkOutput("pkg1/RegClass.Te$t_Enum.html", true,
|
||||
"<a id=\"$FLD2\">",
|
||||
"<section class=\"detail\" id=\"$FLD2\">",
|
||||
"<a href=\"#$FLD2\">");
|
||||
|
||||
// Test nested class
|
||||
checkOutput("pkg1/RegClass._NestedClas$.html", true,
|
||||
"<a id=\"<init>()\">",
|
||||
"<section class=\"detail\" id=\"<init>()\">",
|
||||
"<a href=\"#%3Cinit%3E()\">");
|
||||
|
||||
// Test class use page
|
||||
@ -151,11 +155,11 @@ public class TestAnchorNames extends JavadocTester {
|
||||
// Test serialized form page
|
||||
checkOutput("serialized-form.html", true,
|
||||
//This is the marker for the link that appears in the pkg1.RegClass.html page
|
||||
"<a id=\"pkg1.RegClass\">");
|
||||
"<section class=\"serializedClassDetails\" id=\"pkg1.RegClass\">");
|
||||
|
||||
// Test member name index page
|
||||
checkOutput("index-all.html", true,
|
||||
"<a id=\"I:$\">",
|
||||
"<h2 class=\"title\" id=\"I:$\">$</h2>",
|
||||
"<a href=\"#I:$\">$",
|
||||
"<a href=\"#I:_\">_");
|
||||
}
|
||||
@ -194,10 +198,10 @@ public class TestAnchorNames extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("p/Def.html", true,
|
||||
"<a id=\"\u00e0\u00e9\">",
|
||||
"<a id=\"\u00c0\u00c9()\">",
|
||||
"<a id=\"\u03b1\u03b2\u03b3\">",
|
||||
"<a id=\"\u0391\u0392\u0393()\">");
|
||||
"<section class=\"detail\" id=\"\u00e0\u00e9\">",
|
||||
"<section class=\"detail\" id=\"\u00c0\u00c9()\">",
|
||||
"<section class=\"detail\" id=\"\u03b1\u03b2\u03b3\">",
|
||||
"<section class=\"detail\" id=\"\u0391\u0392\u0393()\">");
|
||||
|
||||
checkOutput("p/Ref.html", true,
|
||||
"<a href=\"Def.html#%C3%A0%C3%A9\"><code>àé</code></a>",
|
||||
|
||||
@ -49,6 +49,6 @@ public class TestAnnotationOptional extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("pkg/AnnotationOptional.html", true,
|
||||
"<a id=\"annotation.type.element.detail\">");
|
||||
"<section class=\"details\" id=\"annotation.type.element.detail\">");
|
||||
}
|
||||
}
|
||||
|
||||
@ -60,7 +60,8 @@ 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><a id=\"DEFAULT_NAME\">DEFAULT_NAME</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"DEFAULT_NAME\">\n"
|
||||
+ "<h3>DEFAULT_NAME</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> "
|
||||
+ "<span class=\"returnType\">java.lang.String</span> "
|
||||
+ "<span class=\"memberName\">DEFAULT_NAME</span></div>\n");
|
||||
@ -75,15 +76,14 @@ public class TestAnnotationTypes extends JavadocTester {
|
||||
"<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->",
|
||||
"<ul class=\"blockList\">",
|
||||
"<li class=\"blockList\">",
|
||||
"<section class=\"memberDetails\">",
|
||||
"<section class=\"details\" id=\"annotation.type.element.detail\">",
|
||||
"<h2>Element Details</h2>",
|
||||
"<a id=\"annotation.type.element.detail\">",
|
||||
"<!-- -->",
|
||||
"</a>",
|
||||
"<ul class=\"blockList\">",
|
||||
"<li class=\"blockList\">",
|
||||
"<section class=\"detail\">",
|
||||
"<h3><a id=\"value()\">value</a></h3>",
|
||||
"<section class=\"detail\" id=\"value()\">",
|
||||
"<h3>value</h3>\n",
|
||||
"<div class=\"memberSignature\"><span class=\"returnType\">int</span>"
|
||||
+ " <span class=\"memberName\">value</span></div>");
|
||||
|
||||
|
||||
@ -59,21 +59,21 @@ public class TestConstructors extends JavadocTester {
|
||||
+ "<a href=\"#%3Cinit%3E(int)\"><code>Outer(int)</code></a>, "
|
||||
+ "<a href=\"Outer.Inner.NestedInner.html#%3Cinit%3E(int)\"><code>NestedInner(int)</code></a>",
|
||||
"<a href=\"#%3Cinit%3E()\">Outer</a></span>()",
|
||||
"<a id=\"<init>(int)\">",
|
||||
"<section class=\"detail\" id=\"<init>()\">",
|
||||
"<a href=\"#%3Cinit%3E(int)\">Outer</a></span>​(int i)",
|
||||
"<a id=\"<init>(int)\">");
|
||||
"<section class=\"detail\" id=\"<init>(int)\">");
|
||||
|
||||
checkOutput("pkg1/Outer.Inner.html", true,
|
||||
"<a href=\"#%3Cinit%3E()\">Inner</a></span>()",
|
||||
"<a id=\"<init>()\">",
|
||||
"<section class=\"detail\" id=\"<init>()\">",
|
||||
"<a href=\"#%3Cinit%3E(int)\">Inner</a></span>​(int i)",
|
||||
"<a id=\"<init>(int)\">");
|
||||
"<section class=\"detail\" id=\"<init>(int)\">");
|
||||
|
||||
checkOutput("pkg1/Outer.Inner.NestedInner.html", true,
|
||||
"<a href=\"#%3Cinit%3E()\">NestedInner</a></span>()",
|
||||
"<a id=\"<init>()\">",
|
||||
"<section class=\"detail\" id=\"<init>()\">",
|
||||
"<a href=\"#%3Cinit%3E(int)\">NestedInner</a></span>​(int i)",
|
||||
"<a id=\"<init>(int)\">");
|
||||
"<section class=\"detail\" id=\"<init>(int)\">");
|
||||
|
||||
checkOutput("pkg1/Outer.Inner.html", false,
|
||||
"Outer.Inner()",
|
||||
|
||||
@ -214,8 +214,7 @@ public class TestDeprecatedDocs extends JavadocTester {
|
||||
+ "<li><a href=\"#enum.constant\">Enum Constants</a></li>\n"
|
||||
+ "<li><a href=\"#annotation.type.member\">Annotation Type Elements</a></li>\n"
|
||||
+ "</ul>",
|
||||
"<a id=\"forRemoval\">",
|
||||
"<div class=\"deprecatedSummary\">\n"
|
||||
"<div class=\"deprecatedSummary\" id=\"forRemoval\">\n"
|
||||
+ "<table>\n"
|
||||
+ "<caption><span>For Removal</span><span class=\"tabEnd\"> </span></caption>\n"
|
||||
+ "<thead>\n"
|
||||
@ -224,7 +223,7 @@ public class TestDeprecatedDocs extends JavadocTester {
|
||||
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
|
||||
+ "</tr>\n"
|
||||
+ "</thead>",
|
||||
"<div class=\"deprecatedSummary\">\n"
|
||||
"<div class=\"deprecatedSummary\" id=\"enum\">\n"
|
||||
+ "<table>\n"
|
||||
+ "<caption><span>Enums</span><span class=\"tabEnd\"> </span></caption>\n"
|
||||
+ "<thead>\n"
|
||||
@ -243,7 +242,7 @@ public class TestDeprecatedDocs extends JavadocTester {
|
||||
+ "</tbody>\n"
|
||||
+ "</table>\n"
|
||||
+ "</div>",
|
||||
"<div class=\"deprecatedSummary\">\n"
|
||||
"<div class=\"deprecatedSummary\" id=\"exception\">\n"
|
||||
+ "<table>\n"
|
||||
+ "<caption><span>Exceptions</span><span class=\"tabEnd\"> </span></caption>\n"
|
||||
+ "<thead>\n"
|
||||
@ -262,7 +261,7 @@ public class TestDeprecatedDocs extends JavadocTester {
|
||||
+ "</tbody>\n"
|
||||
+ "</table>\n"
|
||||
+ "</div>",
|
||||
"<div class=\"deprecatedSummary\">\n"
|
||||
"<div class=\"deprecatedSummary\" id=\"field\">\n"
|
||||
+ "<table>\n"
|
||||
+ "<caption><span>Fields</span><span class=\"tabEnd\"> </span></caption>\n"
|
||||
+ "<thead>\n"
|
||||
|
||||
@ -62,7 +62,8 @@ public class TestHeadings extends JavadocTester {
|
||||
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"col\">Field</th>\n"
|
||||
+ "<th class=\"colLast\" scope=\"col\">Description</th>",
|
||||
"<h3>Methods inherited from class java.lang.Object</h3>");
|
||||
"<h3 id=\"methods.inherited.from.class.java.lang.Object\">"
|
||||
+ "Methods inherited from class java.lang.Object</h3>");
|
||||
|
||||
// Class use documentation
|
||||
checkOutput("pkg1/class-use/C1.html", true,
|
||||
|
||||
@ -52,25 +52,24 @@ public class TestHiddenTag extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("pkg1/A.html", true,
|
||||
"<a id=\"visibleField\">",
|
||||
"<a id=\"visibleMethod()\">",
|
||||
"<section class=\"detail\" id=\"visibleField\">",
|
||||
"<section class=\"detail\" id=\"visibleMethod()\">",
|
||||
"<dt>Direct Known Subclasses:</dt>\n" +
|
||||
"<dd><code><a href=\"A.VisibleInner.html\" title=\"class in pkg1\">" +
|
||||
"A.VisibleInner</a></code>, <code><a href=\"A.VisibleInnerExtendsInvisibleInner.html\" " +
|
||||
"title=\"class in pkg1\">A.VisibleInnerExtendsInvisibleInner</a></code></dd>");
|
||||
|
||||
checkOutput("pkg1/A.html", false,
|
||||
"<a id=\"inVisibleField\">",
|
||||
"<a id=\"inVisibleMethod()\">");
|
||||
"<h3 id=\"inVisibleField\">",
|
||||
"<h3><span id=\"inVisibleMethod()\">");
|
||||
|
||||
checkOutput("pkg1/A.VisibleInner.html", true,
|
||||
"<code><a href=\"A.html#visibleField\">visibleField</a></code>",
|
||||
"<code><a href=\"A.html#visibleMethod()\">visibleMethod</a></code>",
|
||||
"<h2>Nested classes/interfaces inherited from class pkg1." +
|
||||
"<h2 id=\"nested.classes.inherited.from.class.pkg1.A\">" +
|
||||
"Nested classes/interfaces inherited from class pkg1." +
|
||||
"<a href=\"A.html\" title=\"class in pkg1\">A</a></h2>\n" +
|
||||
"<a id=\"nested.classes.inherited.from.class.pkg1.A\">\n" +
|
||||
"<!-- -->\n" +
|
||||
"</a><code><a href=\"A.VisibleInner.html\" title=\"class in pkg1\">" +
|
||||
"<code><a href=\"A.VisibleInner.html\" title=\"class in pkg1\">" +
|
||||
"A.VisibleInner</a>, <a href=\"A.VisibleInnerExtendsInvisibleInner.html\" " +
|
||||
"title=\"class in pkg1\">A.VisibleInnerExtendsInvisibleInner</a></code></div>\n");
|
||||
|
||||
|
||||
@ -56,9 +56,7 @@ 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)\">",
|
||||
//Backward compatibility anchor test."pkg/C1.html",
|
||||
"<a id=\"method(int,int,java.util.ArrayList)\">");
|
||||
"<section class=\"detail\" id=\"method(int,int,java.util.ArrayList)\">");
|
||||
|
||||
checkOutput("pkg/C2.html", true,
|
||||
//{@link} test.
|
||||
|
||||
@ -70,7 +70,7 @@ public class TestHtmlTableStyles extends JavadocTester {
|
||||
"<div class=\"overviewSummary\">\n<table>");
|
||||
|
||||
checkOutput("deprecated-list.html", true,
|
||||
"<div class=\"deprecatedSummary\">\n<table>");
|
||||
"<div class=\"deprecatedSummary\" id=\"method\">\n<table>");
|
||||
|
||||
checkOutput("constant-values.html", true,
|
||||
"<div class=\"constantsSummary\">\n<table>");
|
||||
|
||||
@ -119,8 +119,8 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
|
||||
// Deprecated
|
||||
checkOutput("deprecated-list.html", true,
|
||||
"<div class=\"deprecatedSummary\">\n<table>",
|
||||
"<div class=\"deprecatedSummary\">\n<table>");
|
||||
"<div class=\"deprecatedSummary\" id=\"field\">\n<table>",
|
||||
"<div class=\"deprecatedSummary\" id=\"method\">\n<table>");
|
||||
|
||||
// Constant values
|
||||
checkOutput("constant-values.html", true,
|
||||
@ -224,10 +224,10 @@ public class TestHtmlTableTags extends JavadocTester {
|
||||
|
||||
// Deprecated
|
||||
checkOutput("deprecated-list.html", true,
|
||||
"<div class=\"deprecatedSummary\">\n"
|
||||
"<div class=\"deprecatedSummary\" id=\"field\">\n"
|
||||
+ "<table summary=\"Fields table, listing fields, "
|
||||
+ "and an explanation\">",
|
||||
"<div class=\"deprecatedSummary\">\n"
|
||||
"<div class=\"deprecatedSummary\" id=\"method\">\n"
|
||||
+ "<table summary=\"Methods table, listing methods, "
|
||||
+ "and an explanation\">");
|
||||
|
||||
|
||||
@ -108,9 +108,7 @@ public class TestHtmlTag extends JavadocTester {
|
||||
|
||||
checkOutput("pkg3/package-summary.html", true,
|
||||
"<div class=\"contentContainer\">\n"
|
||||
+ "<section class=\"packageDescription\"><a id=\"package.description\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<section class=\"packageDescription\" id=\"package.description\">\n"
|
||||
+ "<div class=\"block\"><p>This is the first line. Note the newlines before the <p> is relevant.</div>\n"
|
||||
+ "</section>");
|
||||
|
||||
|
||||
@ -71,9 +71,7 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("index.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<div class=\"overviewSummary\">\n"
|
||||
+ "<table>\n"
|
||||
+ "<caption>",
|
||||
@ -88,18 +86,14 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg/package-summary.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<div class=\"typeSummary\">\n<table>",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
"<main role=\"main\">\n"
|
||||
+ "<div class=\"header\">",
|
||||
"<section class=\"packageDescription\"><a id=\"package.description\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"packageDescription\" id=\"package.description\">\n"
|
||||
+ "<div class=\"block\">Test package.</div>",
|
||||
"<footer role=\"contentinfo\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -117,9 +111,7 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg/package-tree.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<li class=\"circle\">",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -142,9 +134,7 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg1/package-use.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<div class=\"useSummary\">\n<table>",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -159,9 +149,7 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("constant-values.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<div class=\"constantsSummary\">\n<table>",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -170,7 +158,7 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
+ "<div class=\"header\">",
|
||||
"<section class=\"packages\">\n"
|
||||
+ "<h2 title=\"Contents\">Contents</h2>\n",
|
||||
"<section class=\"constantsSummary\">\n"
|
||||
"<section class=\"constantsSummary\" id=\"pkg\">\n"
|
||||
+ "<h2 title=\"pkg\">pkg.*</h2>\n",
|
||||
"<footer role=\"contentinfo\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -180,10 +168,8 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("deprecated-list.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<div class=\"deprecatedSummary\">\n<table>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<div class=\"deprecatedSummary\" id=\"class\">\n<table>",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
@ -197,9 +183,7 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("serialized-form.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
@ -215,9 +199,7 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("overview-tree.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<li class=\"circle\">",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -240,9 +222,7 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("index-all.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
@ -263,9 +243,7 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("help-doc.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
@ -285,48 +263,29 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg/AnotherClass.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
"<main role=\"main\">\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->\n"
|
||||
+ "<div class=\"header\">",
|
||||
"<section class=\"nestedClassSummary\"><a id=\"nested.class.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"nestedClassSummary\" id=\"nested.class.summary\">\n"
|
||||
+ "<h2>Nested Class Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n<table>",
|
||||
"<section class=\"fieldSummary\"><a id=\"field.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"fieldSummary\" id=\"field.summary\">\n"
|
||||
+ "<h2>Field Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n<table>",
|
||||
"<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"constructorSummary\" id=\"constructor.summary\">\n"
|
||||
+ "<h2>Constructor Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n<table>",
|
||||
"<section class=\"methodSummary\"><a id=\"method.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"methodSummary\" id=\"method.summary\">\n"
|
||||
+ "<h2>Method Summary</h2>",
|
||||
"<section class=\"fieldDetails\">"
|
||||
+ "<a id=\"field.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"fieldDetails\" id=\"field.detail\">\n"
|
||||
+ "<h2>Field Details</h2>\n",
|
||||
"<section class=\"constructorDetails\">"
|
||||
+ "<a id=\"constructor.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
|
||||
+ "<h2>Constructor Details</h2>\n",
|
||||
"<section class=\"methodDetails\">"
|
||||
+ "<a id=\"method.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"methodDetails\" id=\"method.detail\">\n"
|
||||
+ "<h2>Method Details</h2>\n",
|
||||
"<footer role=\"contentinfo\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -336,36 +295,24 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg/AnotherClass.ModalExclusionType.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
"<main role=\"main\">\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->\n"
|
||||
+ "<div class=\"header\">",
|
||||
"<section class=\"constantsSummary\"><a id=\"enum.constant.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"constantsSummary\" id=\"enum.constant.summary\">\n"
|
||||
+ "<h2>Enum Constant Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n",
|
||||
"<table aria-labelledby=\"t0\">\n",
|
||||
"<section class=\"methodSummary\"><a id=\"method.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"methodSummary\" id=\"method.summary\">\n"
|
||||
+ "<h2>Method Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n",
|
||||
"<table aria-labelledby=\"t0\">",
|
||||
"<section class=\"constantDetails\">"
|
||||
+ "<a id=\"enum.constant.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"constantDetails\" id=\"enum.constant.detail\">\n"
|
||||
+ "<h2>Enum Constant Details</h2>\n",
|
||||
"<section class=\"methodDetails\">"
|
||||
+ "<a id=\"method.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"methodDetails\" id=\"method.detail\">\n"
|
||||
+ "<h2>Method Details</h2>\n",
|
||||
"<footer role=\"contentinfo\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -375,25 +322,18 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg2/Interface.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
"<main role=\"main\">\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->\n"
|
||||
+ "<div class=\"header\">",
|
||||
"<section class=\"methodSummary\"><a id=\"method.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"methodSummary\" id=\"method.summary\">\n"
|
||||
+ "<h2>Method Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n",
|
||||
"<table aria-labelledby=\"t0\">\n",
|
||||
"<section class=\"methodDetails\">"
|
||||
+ "<a id=\"method.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"methodDetails\" id=\"method.detail\">\n"
|
||||
+ "<h2>Method Details</h2>\n",
|
||||
"<footer role=\"contentinfo\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -403,23 +343,16 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg/TestError.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
"<main role=\"main\">\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->\n"
|
||||
+ "<div class=\"header\">",
|
||||
"<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"constructorSummary\" id=\"constructor.summary\">\n"
|
||||
+ "<h2>Constructor Summary</h2>",
|
||||
"<section class=\"constructorDetails\">"
|
||||
+ "<a id=\"constructor.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
|
||||
+ "<h2>Constructor Details</h2>\n",
|
||||
"<footer role=\"contentinfo\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -429,23 +362,16 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg/TestException.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
"<main role=\"main\">\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->\n"
|
||||
+ "<div class=\"header\">",
|
||||
"<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"constructorSummary\" id=\"constructor.summary\">\n"
|
||||
+ "<h2>Constructor Summary</h2>",
|
||||
"<section class=\"constructorDetails\">"
|
||||
+ "<a id=\"constructor.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
|
||||
+ "<h2>Constructor Details</h2>\n",
|
||||
"<footer role=\"contentinfo\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
@ -455,30 +381,25 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg2/TestAnnotationType.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
"<main role=\"main\">\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->\n"
|
||||
+ "<div class=\"header\">",
|
||||
"<section class=\"memberSummary\"><a id=\"annotation.type.required.element.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"memberSummary\" id=\"annotation.type.required.element.summary\">\n"
|
||||
+ "<h2>Required Element Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n<table>",
|
||||
"<section class=\"memberSummary\"><a id=\"annotation.type.optional.element.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"memberSummary\" id=\"annotation.type.optional.element.summary\">\n"
|
||||
+ "<h2>Optional Element Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n<table>",
|
||||
"<section class=\"memberDetails\">"
|
||||
+ "<a id=\"annotation.type.element.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<h2>Element Details</h2>",
|
||||
"<section class=\"details\" id=\"annotation.type.element.detail\">\n"
|
||||
+ "<ul class=\"blockList\">\n"
|
||||
+ "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
|
||||
+ "<li class=\"blockList\">\n"
|
||||
+ "<section class=\"memberDetails\">\n"
|
||||
+ "<h2>Element Details</h2>\n",
|
||||
"<footer role=\"contentinfo\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
|
||||
@ -487,18 +408,14 @@ public class TestHtmlVersion extends JavadocTester {
|
||||
checkOutput("pkg1/class-use/RegClass.html", true,
|
||||
"<!DOCTYPE HTML>",
|
||||
"<meta name=\"dc.created\"",
|
||||
"<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<header role=\"banner\" class=\"flexHeader\">\n"
|
||||
+ "<nav role=\"navigation\">\n"
|
||||
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
|
||||
"<main role=\"main\">\n"
|
||||
+ "<div class=\"header\">",
|
||||
"<div class=\"useSummary\">\n<table>",
|
||||
"<section class=\"detail\"><a id=\"pkg\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"detail\" id=\"pkg\">\n"
|
||||
+ "<h2>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h2>\n"
|
||||
+ "<div class=\"useSummary\">\n<table>",
|
||||
"<footer role=\"contentinfo\">\n"
|
||||
|
||||
@ -96,12 +96,12 @@ public class TestIndexInDocFiles extends JavadocTester {
|
||||
|
||||
checkOutput("doc-files/top-level-file.html", true,
|
||||
"<h1>Package HTML file</h1>\n"
|
||||
+ "<a id=\"top-level-index\" class=\"searchTagResult\">top-level-index</a>\n"
|
||||
+ "<code><a id=\"top.level.property\" class=\"searchTagResult\">top.level.property</a></code>\n");
|
||||
+ "<span id=\"top-level-index\" class=\"searchTagResult\">top-level-index</span>\n"
|
||||
+ "<code><span id=\"top.level.property\" class=\"searchTagResult\">top.level.property</span></code>\n");
|
||||
checkOutput("p/q/doc-files/package-file.html", true,
|
||||
"<h1>Package HTML file</h1>\n"
|
||||
+ "<a id=\"package-index\" class=\"searchTagResult\">package-index</a>\n"
|
||||
+ "<code><a id=\"package.property\" class=\"searchTagResult\">package.property</a></code>\n");
|
||||
+ "<span id=\"package-index\" class=\"searchTagResult\">package-index</span>\n"
|
||||
+ "<code><span id=\"package.property\" class=\"searchTagResult\">package.property</span></code>\n");
|
||||
checkOutput("tag-search-index.js", true,
|
||||
"{\"l\":\"package-index\",\"h\":\"package p.q\",\"d\":\"additional info\","
|
||||
+ "\"u\":\"p/q/doc-files/package-file.html#package-index\"}",
|
||||
@ -157,12 +157,12 @@ public class TestIndexInDocFiles extends JavadocTester {
|
||||
|
||||
checkOutput("m.n/doc-files/module-file.html", true,
|
||||
"<h1>Module HTML file</h1>\n"
|
||||
+ "<a id=\"module-index\" class=\"searchTagResult\">module-index</a>\n"
|
||||
+ "<code><a id=\"module.property\" class=\"searchTagResult\">module.property</a></code>\n");
|
||||
+ "<span id=\"module-index\" class=\"searchTagResult\">module-index</span>\n"
|
||||
+ "<code><span id=\"module.property\" class=\"searchTagResult\">module.property</span></code>\n");
|
||||
checkOutput("m.n/p/q/doc-files/package-file.html", true,
|
||||
"<h1>Package HTML file</h1>\n"
|
||||
+ "<a id=\"package-index\" class=\"searchTagResult\">package-index</a>\n"
|
||||
+ "<code><a id=\"package.property\" class=\"searchTagResult\">package.property</a></code>\n");
|
||||
+ "<span id=\"package-index\" class=\"searchTagResult\">package-index</span>\n"
|
||||
+ "<code><span id=\"package.property\" class=\"searchTagResult\">package.property</span></code>\n");
|
||||
checkOutput("tag-search-index.js", true,
|
||||
"{\"l\":\"module-index\",\"h\":\"module m.n\",\"d\":\"additional info\","
|
||||
+ "\"u\":\"m.n/doc-files/module-file.html#module-index\"}",
|
||||
|
||||
@ -88,15 +88,15 @@ public class TestIndexInPackageFiles extends JavadocTester {
|
||||
// to match the A-Z index files checked here.
|
||||
|
||||
checkOutput("p/q/package-summary.html", true,
|
||||
"<a id=\"test.name.1\" class=\"searchTagResult\">test.name.1</a>",
|
||||
"<a id=\"test.property.1\" class=\"searchTagResult\">test.property.1</a>");
|
||||
"<span id=\"test.name.1\" class=\"searchTagResult\">test.name.1</span>",
|
||||
"<span id=\"test.property.1\" class=\"searchTagResult\">test.property.1</span>");
|
||||
|
||||
checkOutput("p/q/doc-files/extra.html", true,
|
||||
"<a id=\"test.name.2\" class=\"searchTagResult\">test.name.2</a>",
|
||||
"<a id=\"test.property.2\" class=\"searchTagResult\">test.property.2</a>");
|
||||
"<span id=\"test.name.2\" class=\"searchTagResult\">test.name.2</span>",
|
||||
"<span id=\"test.property.2\" class=\"searchTagResult\">test.property.2</span>");
|
||||
|
||||
checkOutput("index.html", true,
|
||||
"<a id=\"test.name.3\" class=\"searchTagResult\">test.name.3</a>");
|
||||
"<span id=\"test.name.3\" class=\"searchTagResult\">test.name.3</span>");
|
||||
|
||||
checkOutput("index-all.html", true,
|
||||
"<span class=\"searchTagLink\"><a href=\"p/q/package-summary.html#test.name.1\">test.name.1</a></span>",
|
||||
|
||||
@ -76,8 +76,8 @@ public class TestIndexTaglet extends JavadocTester {
|
||||
|
||||
checkOrder("pkg/A.html",
|
||||
"<h2>Method Details</h2>\n",
|
||||
"<div class=\"block\">test description with <a id=\"search_phrase_a\" "
|
||||
+ "class=\"searchTagResult\">search_phrase_a</a></div>");
|
||||
"<div class=\"block\">test description with <span id=\"search_phrase_a\" "
|
||||
+ "class=\"searchTagResult\">search_phrase_a</span></div>");
|
||||
|
||||
checkOrder("pkg/A.html",
|
||||
"<h2>Method Summary</h2>\n",
|
||||
@ -124,7 +124,7 @@ public class TestIndexTaglet extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("pkg/A.html", true,
|
||||
"This is a class. Here is <a id=\"foo\" class=\"searchTagResult\">foo</a>.",
|
||||
"This is a method. Here is <a id=\"foo-1\" class=\"searchTagResult\">foo</a>.");
|
||||
"This is a class. Here is <span id=\"foo\" class=\"searchTagResult\">foo</span>.",
|
||||
"This is a method. Here is <span id=\"foo-1\" class=\"searchTagResult\">foo</span>.");
|
||||
}
|
||||
}
|
||||
|
||||
@ -123,7 +123,8 @@ public class TestInterface extends JavadocTester {
|
||||
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n");
|
||||
|
||||
checkOutput("pkg/ClassWithStaticMembers.html", true,
|
||||
"<h3><a id=\"f\">f</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"f\">\n"
|
||||
+ "<h3>f</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span> "
|
||||
+ "<span class=\"returnType\">int</span> <span class=\"memberName\">f</span></div>\n"
|
||||
+ "<div class=\"block\">A hider field</div>",
|
||||
@ -135,7 +136,8 @@ public class TestInterface extends JavadocTester {
|
||||
+ "<div class=\"block\">A hider method</div>\n"
|
||||
+ "</td>\n",
|
||||
|
||||
"<h3><a id=\"staticMethod()\">staticMethod</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"staticMethod()\">\n"
|
||||
+ "<h3>staticMethod</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span> "
|
||||
+ "<span class=\"returnType\">void</span> <span class=\"memberName\">staticMethod</span>()</div>\n"
|
||||
+ "<div class=\"block\"><span class=\"descfrmTypeLabel\">"
|
||||
@ -177,11 +179,10 @@ public class TestInterface extends JavadocTester {
|
||||
|
||||
checkOutput("pkg2/Spliterator.OfDouble.html", true,
|
||||
// Ensure the correct type parameters are displayed correctly
|
||||
"<h2>Nested classes/interfaces inherited from interface pkg2."
|
||||
"<h2 id=\"nested.classes.inherited.from.class.pkg2.Spliterator\">"
|
||||
+ "Nested classes/interfaces inherited from interface pkg2."
|
||||
+ "<a href=\"Spliterator.html\" title=\"interface in pkg2\">Spliterator</a></h2>\n"
|
||||
+ "<a id=\"nested.classes.inherited.from.class.pkg2.Spliterator\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a><code><a href=\"Spliterator.OfDouble.html\" title=\"interface in pkg2\">"
|
||||
+ "<code><a href=\"Spliterator.OfDouble.html\" title=\"interface in pkg2\">"
|
||||
+ "Spliterator.OfDouble</a>, <a href=\"Spliterator.OfInt.html\" "
|
||||
+ "title=\"interface in pkg2\">Spliterator.OfInt</a><"
|
||||
+ "<a href=\"Spliterator.OfInt.html\" title=\"type parameter in Spliterator.OfInt\">"
|
||||
|
||||
@ -88,16 +88,19 @@ 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><a id=\"pausedProperty\">paused</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"pausedProperty\">\n"
|
||||
+ "<h3>paused</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
|
||||
+ "<span class=\"returnType\"><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">"
|
||||
+ "C.BooleanProperty</a></span> <span class=\"memberName\">pausedProperty</span></div>\n"
|
||||
+ "<div class=\"block\">Defines if paused. The second line.</div>",
|
||||
"<h3><a id=\"isPaused()\">isPaused</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"isPaused()\">\n"
|
||||
+ "<h3>isPaused</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
|
||||
+ "<span class=\"returnType\">double</span> <span class=\"memberName\">isPaused</span>()</div>\n"
|
||||
+ "<div class=\"block\">Gets the value of the property paused.</div>",
|
||||
"<h3><a id=\"setPaused(boolean)\">setPaused</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"setPaused(boolean)\">\n"
|
||||
+ "<h3>setPaused</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
|
||||
+ "<span class=\"returnType\">void</span> <span class=\"memberName\">setPaused</span>​"
|
||||
+ "(<span class=\"arguments\">boolean value)</span></div>\n"
|
||||
@ -107,7 +110,8 @@ 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><a id=\"isPaused()\">isPaused</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"isPaused()\">\n"
|
||||
+ "<h3>isPaused</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
|
||||
+ "<span class=\"returnType\">double</span> <span class=\"memberName\">isPaused</span>()</div>\n"
|
||||
+ "<div class=\"block\">Gets the value of the property paused.</div>\n"
|
||||
@ -116,14 +120,16 @@ 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><a id=\"rateProperty\">rate</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"rateProperty\">\n"
|
||||
+ "<h3>rate</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
|
||||
+ "<span class=\"returnType\"><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">"
|
||||
+ "C.DoubleProperty</a></span> <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><a id=\"setRate(double)\">setRate</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"setRate(double)\">\n"
|
||||
+ "<h3>setRate</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
|
||||
+ "<span class=\"returnType\">void</span> <span class=\"memberName\">setRate</span>​"
|
||||
+ "(<span class=\"arguments\">double value)</span></div>\n"
|
||||
@ -136,7 +142,8 @@ public class TestJavaFX extends JavadocTester {
|
||||
+ "<dd>11</dd>\n"
|
||||
+ "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
|
||||
+ "<dd>JavaFX 8.0</dd>",
|
||||
"<h3><a id=\"getRate()\">getRate</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"getRate()\">\n"
|
||||
+ "<h3>getRate</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
|
||||
+ "<span class=\"returnType\">double</span> <span class=\"memberName\">getRate</span>()</div>\n"
|
||||
+ "<div class=\"block\">Gets the value of the property rate.</div>\n"
|
||||
@ -148,7 +155,8 @@ public class TestJavaFX extends JavadocTester {
|
||||
+ "<dd>11</dd>\n"
|
||||
+ "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
|
||||
+ "<dd>JavaFX 8.0</dd>",
|
||||
"<h2>Property Summary</h2>\n"
|
||||
"<section class=\"propertySummary\" id=\"property.summary\">\n"
|
||||
+ "<h2>Property Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n<table>\n"
|
||||
+ "<caption><span>Properties</span><span class=\"tabEnd\"> </span></caption>",
|
||||
"<tr class=\"altColor\">\n"
|
||||
@ -158,7 +166,7 @@ public class TestJavaFX extends JavadocTester {
|
||||
|
||||
checkOutput("pkg1/C.html", false,
|
||||
"A()",
|
||||
"<h2>Property Summary</h2>\n"
|
||||
"<h2 id=\"property.summary\">Property Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n"
|
||||
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
|
||||
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
|
||||
@ -179,11 +187,9 @@ public class TestJavaFX extends JavadocTester {
|
||||
"<div class=\"block\">Defines if paused.</div>");
|
||||
|
||||
checkOutput("pkg1/D.html", true,
|
||||
"<h3>Properties inherited from class pkg1."
|
||||
"<h3 id=\"properties.inherited.from.class.pkg1.C\">Properties inherited from class pkg1."
|
||||
+ "<a href=\"C.html\" title=\"class in pkg1\">C</a></h3>\n"
|
||||
+ "<a id=\"properties.inherited.from.class.pkg1.C\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a><code><a href=\"C.html#pausedProperty\">"
|
||||
+ "<code><a href=\"C.html#pausedProperty\">"
|
||||
+ "paused</a>, <a href=\"C.html#rateProperty\">rate</a></code></div>");
|
||||
|
||||
checkOutput("pkg1/D.html", false, "shouldNotAppear");
|
||||
@ -203,30 +209,28 @@ public class TestJavaFX extends JavadocTester {
|
||||
"pkg2");
|
||||
checkExit(Exit.OK);
|
||||
checkOutput("pkg2/Test.html", true,
|
||||
"<a id=\"property.detail\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"propertyDetails\" id=\"property.detail\">\n"
|
||||
+ "<h2>Property Details</h2>\n"
|
||||
+ "<ul class=\"blockList\">\n"
|
||||
+ "<li class=\"blockList\">\n"
|
||||
+ "<section class=\"detail\">\n"
|
||||
+ "<h3><a id=\"betaProperty\">beta</a></h3>\n"
|
||||
+ "<section class=\"detail\" id=\"betaProperty\">\n"
|
||||
+ "<h3>beta</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
|
||||
+ "<span class=\"returnType\">java.lang.Object</span>"
|
||||
+ " <span class=\"memberName\">betaProperty</span></div>\n"
|
||||
+ "</section>\n"
|
||||
+ "</li>\n"
|
||||
+ "<li class=\"blockList\">\n"
|
||||
+ "<section class=\"detail\">\n"
|
||||
+ "<h3><a id=\"gammaProperty\">gamma</a></h3>\n"
|
||||
+ "<section class=\"detail\" id=\"gammaProperty\">\n"
|
||||
+ "<h3>gamma</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
|
||||
+ "<span class=\"returnType\">java.util.List<java.lang.String></span>"
|
||||
+ " <span class=\"memberName\">gammaProperty</span></div>\n"
|
||||
+ "</section>\n"
|
||||
+ "</li>\n"
|
||||
+ "<li class=\"blockList\">\n"
|
||||
+ "<section class=\"detail\">\n"
|
||||
+ "<h3><a id=\"deltaProperty\">delta</a></h3>\n"
|
||||
+ "<section class=\"detail\" id=\"deltaProperty\">\n"
|
||||
+ "<h3>delta</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
|
||||
+ "<span class=\"returnType\">java.util.List<java.util.Set<? super java.lang.Object>>"
|
||||
+ "</span> <span class=\"memberName\">deltaProperty</span></div>\n"
|
||||
@ -234,7 +238,8 @@ public class TestJavaFX extends JavadocTester {
|
||||
+ "</li>\n"
|
||||
+ "</ul>\n"
|
||||
+ "</section>",
|
||||
"<h2>Property Summary</h2>\n"
|
||||
"<section class=\"propertySummary\" id=\"property.summary\">\n"
|
||||
+ "<h2>Property Summary</h2>\n"
|
||||
+ "<div class=\"memberSummary\">\n<table>\n"
|
||||
+ "<caption><span>Properties</span><span class=\"tabEnd\"> </span></caption>");
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ public class TestLinkToSerialForm extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("serialized-form.html", true,
|
||||
"<a id=\"pkg.C\">");
|
||||
"<section class=\"serializedClassDetails\" id=\"pkg.C\">");
|
||||
checkOutput("pkg/C.html", true,
|
||||
"<a href=\"../serialized-form.html#pkg.C\">");
|
||||
}
|
||||
|
||||
@ -120,7 +120,8 @@ public class TestMemberInheritance extends JavadocTester {
|
||||
+ "</td>\n");
|
||||
|
||||
checkOutput("pkg2/DocumentedNonGenericChild.html", true,
|
||||
"<h3><a id=\"parentMethod()\">parentMethod</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"parentMethod()\">\n"
|
||||
+ "<h3>parentMethod</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">protected abstract</span>"
|
||||
+ " <span class=\"returnType\">java.lang.String</span> "
|
||||
+ "<span class=\"memberName\">parentMethod</span>()</div>");
|
||||
|
||||
@ -70,8 +70,7 @@ public class TestMemberSummary extends JavadocTester {
|
||||
|
||||
// Legacy anchor dimensions (6290760)
|
||||
checkOutput("pkg2/A.html", true,
|
||||
"<a id=\"f(java.lang.Object[])\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a><a id=\"f(T[])\">f</a>");
|
||||
"<section class=\"detail\" id=\"f(T[])\">\n"
|
||||
+ "<h3 id=\"f(java.lang.Object[])\">f</h3>\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -462,14 +462,14 @@ public class TestModules extends JavadocTester {
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<div class=\"block\">This is a test description for the moduleA module with a Search "
|
||||
+ "phrase <a id=\"searchphrase\" class=\"searchTagResult\">search phrase</a>.</div>");
|
||||
+ "phrase <span id=\"searchphrase\" class=\"searchTagResult\">search phrase</span>.</div>");
|
||||
checkOutput("moduleB/module-summary.html", found,
|
||||
"<!-- ============ MODULE DESCRIPTION =========== -->\n"
|
||||
+ "<a name=\"module.description\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<div class=\"block\">This is a test description for the moduleB module. Search "
|
||||
+ "word <a id=\"search_word\" class=\"searchTagResult\">search_word</a> with no description.</div>");
|
||||
+ "word <span id=\"search_word\" class=\"searchTagResult\">search_word</span> with no description.</div>");
|
||||
checkOutput("index.html", found,
|
||||
"</script>\n"
|
||||
+ "<div class=\"contentContainer\">\n"
|
||||
@ -510,25 +510,19 @@ public class TestModules extends JavadocTester {
|
||||
|
||||
void checkHtml5Description(boolean found) {
|
||||
checkOutput("moduleA/module-summary.html", found,
|
||||
"<section class=\"moduleDescription\">\n"
|
||||
"<section class=\"moduleDescription\" id=\"module.description\">\n"
|
||||
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal:"
|
||||
+ " This API element is subject to removal in a future version.</span>\n"
|
||||
+ "<div class=\"deprecationComment\">This module is deprecated.</div>\n"
|
||||
+ "</div>\n"
|
||||
+ "<!-- ============ MODULE DESCRIPTION =========== -->\n"
|
||||
+ "<a id=\"module.description\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<div class=\"block\">This is a test description for the moduleA module with a Search "
|
||||
+ "phrase <a id=\"searchphrase\" class=\"searchTagResult\">search phrase</a>.</div>");
|
||||
+ "phrase <span id=\"searchphrase\" class=\"searchTagResult\">search phrase</span>.</div>");
|
||||
checkOutput("moduleB/module-summary.html", found,
|
||||
"<section class=\"moduleDescription\">\n"
|
||||
"<section class=\"moduleDescription\" id=\"module.description\">\n"
|
||||
+ "<!-- ============ MODULE DESCRIPTION =========== -->\n"
|
||||
+ "<a id=\"module.description\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
+ "<div class=\"block\">This is a test description for the moduleB module. Search "
|
||||
+ "word <a id=\"search_word\" class=\"searchTagResult\">search_word</a> with no description.</div>");
|
||||
+ "word <span id=\"search_word\" class=\"searchTagResult\">search_word</span> with no description.</div>");
|
||||
checkOutput("index.html", found,
|
||||
"</nav>\n"
|
||||
+ "</header>\n"
|
||||
@ -559,14 +553,14 @@ public class TestModules extends JavadocTester {
|
||||
+ "<section class=\"summary\">\n"
|
||||
+ "<ul class=\"blockList\">\n"
|
||||
+ "<li class=\"blockList\">\n"
|
||||
+ "<section class=\"packagesSummary\">\n"
|
||||
+ "<section class=\"packagesSummary\" id=\"packages.summary\">\n"
|
||||
+ "<!-- ============ PACKAGES SUMMARY =========== -->");
|
||||
checkOutput("moduleB/module-summary.html", found,
|
||||
"<div class=\"contentContainer\">\n"
|
||||
+ "<section class=\"summary\">\n"
|
||||
+ "<ul class=\"blockList\">\n"
|
||||
+ "<li class=\"blockList\">\n"
|
||||
+ "<section class=\"packagesSummary\">\n"
|
||||
+ "<section class=\"packagesSummary\" id=\"packages.summary\">\n"
|
||||
+ "<!-- ============ PACKAGES SUMMARY =========== -->");
|
||||
}
|
||||
|
||||
@ -765,18 +759,16 @@ public class TestModules extends JavadocTester {
|
||||
+ "<li><a href=\"#packages.summary\">Packages</a> | </li>\n"
|
||||
+ "<li>Services</li>\n"
|
||||
+ "</ul>",
|
||||
"<!-- ============ MODULES SUMMARY =========== -->\n"
|
||||
+ "<a id=\"modules.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<section class=\"modulesSummary\" id=\"modules.summary\">\n"
|
||||
+ "<!-- ============ MODULES SUMMARY =========== -->\n"
|
||||
+ "<h2>Modules</h2>",
|
||||
"<tr class=\"altColor\" id=\"i0\">\n"
|
||||
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
|
||||
+ "<td class=\"colLast\"> </td>\n"
|
||||
+ "</tr>",
|
||||
"<!-- ============ PACKAGES SUMMARY =========== -->\n"
|
||||
+ "<a id=\"packages.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
"<section class=\"packagesSummary\" id=\"packages.summary\">\n"
|
||||
+ "<!-- ============ PACKAGES SUMMARY =========== -->\n"
|
||||
+ "<h2>Packages</h2>",
|
||||
"<tr class=\"altColor\">\n"
|
||||
+ "<td class=\"colFirst\">transitive</td>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
|
||||
@ -790,21 +782,15 @@ public class TestModules extends JavadocTester {
|
||||
+ "<li><a href=\"#packages.summary\">Packages</a> | </li>\n"
|
||||
+ "<li><a href=\"#services.summary\">Services</a></li>",
|
||||
"<!-- ============ PACKAGES SUMMARY =========== -->\n"
|
||||
+ "<a id=\"packages.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
+ "<h2>Packages</h2>",
|
||||
"<tr class=\"altColor\" id=\"i0\">\n"
|
||||
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
|
||||
+ "<td class=\"colLast\"> </td>\n"
|
||||
+ "</tr>",
|
||||
"<!-- ============ PACKAGES SUMMARY =========== -->\n"
|
||||
+ "<a id=\"packages.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
+ "<h2>Packages</h2>",
|
||||
"<!-- ============ SERVICES SUMMARY =========== -->\n"
|
||||
+ "<a id=\"services.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
+ "<h2>Services</h2>",
|
||||
"<tr class=\"altColor\">\n"
|
||||
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/TestClassInModuleB.html\" title=\"class in testpkgmdlB\">TestClassInModuleB</a></th>\n"
|
||||
+ "<td class=\"colLast\">\n"
|
||||
@ -839,7 +825,7 @@ public class TestModules extends JavadocTester {
|
||||
+ "<h1 title=\"Module\" class=\"title\">Module moduleT</h1>\n"
|
||||
+ "</div>",
|
||||
"<div class=\"block\">This is a test description for the moduleT module. "
|
||||
+ "Search phrase <a id=\"searchphrase\" class=\"searchTagResult\">search phrase</a>. "
|
||||
+ "Search phrase <span id=\"searchphrase\" class=\"searchTagResult\">search phrase</span>. "
|
||||
+ "Make sure there are no exported packages.</div>",
|
||||
"<tbody>\n"
|
||||
+ "<tr class=\"altColor\">\n"
|
||||
@ -863,9 +849,7 @@ public class TestModules extends JavadocTester {
|
||||
void checkNegatedModuleSummary() {
|
||||
checkOutput("moduleA/module-summary.html", false,
|
||||
"<!-- ============ SERVICES SUMMARY =========== -->\n"
|
||||
+ "<a id=\"services.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>");
|
||||
+ "<h2>Services</h2>");
|
||||
}
|
||||
|
||||
void checkModuleFilesAndLinks(boolean found) {
|
||||
@ -1125,9 +1109,7 @@ public class TestModules extends JavadocTester {
|
||||
void checkModuleSummaryNoExported(boolean found) {
|
||||
checkOutput("moduleNoExport/module-summary.html", found,
|
||||
"<!-- ============ PACKAGES SUMMARY =========== -->\n"
|
||||
+ "<a id=\"packages.summary\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
+ "<h2>Packages</h2>",
|
||||
"<caption><span>Concealed</span><span class=\"tabEnd\"> </span></caption>");
|
||||
}
|
||||
|
||||
@ -1243,7 +1225,7 @@ public class TestModules extends JavadocTester {
|
||||
+ "<h1 title=\"Module\" class=\"title\">Module test.moduleFullName</h1>\n"
|
||||
+ "</div>");
|
||||
checkOutput("index-all.html", found,
|
||||
"<h2 class=\"title\">T</h2>\n"
|
||||
"<h2 class=\"title\" id=\"I:T\">T</h2>\n"
|
||||
+ "<dl>\n"
|
||||
+ "<dt><a href=\"test.moduleFullName/module-summary.html\">test.moduleFullName</a> - module test.moduleFullName</dt>\n"
|
||||
+ "<dd>\n"
|
||||
@ -1287,21 +1269,21 @@ public class TestModules extends JavadocTester {
|
||||
+ "<pre>public class <a href=\"../../src-html/moduleA/testpkgmdlA/TestClassInModuleA.html#line.25\">"
|
||||
+ "TestClassInModuleA</a>\nextends java.lang.Object</pre>\n</section>");
|
||||
checkOutput("src-html/moduleA/testpkgmdlA/TestClassInModuleA.html", true,
|
||||
"<span class=\"sourceLineNo\">019</span><a id=\"line.19\"> * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA</a>\n"
|
||||
+ "<span class=\"sourceLineNo\">020</span><a id=\"line.20\"> * or visit www.oracle.com if you need additional information or have any</a>\n"
|
||||
+ "<span class=\"sourceLineNo\">021</span><a id=\"line.21\"> * questions.</a>\n"
|
||||
+ "<span class=\"sourceLineNo\">022</span><a id=\"line.22\"> */</a>\n"
|
||||
+ "<span class=\"sourceLineNo\">023</span><a id=\"line.23\">package testpkgmdlA;</a>\n"
|
||||
+ "<span class=\"sourceLineNo\">024</span><a id=\"line.24\"></a>\n"
|
||||
+ "<span class=\"sourceLineNo\">025</span><a id=\"line.25\">public class TestClassInModuleA {</a>\n"
|
||||
+ "<span class=\"sourceLineNo\">026</span><a id=\"line.26\">}</a>");
|
||||
"<span class=\"sourceLineNo\">019</span><span id=\"line.19\"> * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA</span>\n"
|
||||
+ "<span class=\"sourceLineNo\">020</span><span id=\"line.20\"> * or visit www.oracle.com if you need additional information or have any</span>\n"
|
||||
+ "<span class=\"sourceLineNo\">021</span><span id=\"line.21\"> * questions.</span>\n"
|
||||
+ "<span class=\"sourceLineNo\">022</span><span id=\"line.22\"> */</span>\n"
|
||||
+ "<span class=\"sourceLineNo\">023</span><span id=\"line.23\">package testpkgmdlA;</span>\n"
|
||||
+ "<span class=\"sourceLineNo\">024</span><span id=\"line.24\"></span>\n"
|
||||
+ "<span class=\"sourceLineNo\">025</span><span id=\"line.25\">public class TestClassInModuleA {</span>\n"
|
||||
+ "<span class=\"sourceLineNo\">026</span><span id=\"line.26\">}</span>");
|
||||
if (includePrivate) {
|
||||
checkOutput("src-html/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.html", true,
|
||||
"<span class=\"sourceLineNo\">024</span><a id=\"line.24\">package concealedpkgmdlA;</a>\n"
|
||||
+ "<span class=\"sourceLineNo\">025</span><a id=\"line.25\"></a>\n"
|
||||
+ "<span class=\"sourceLineNo\">026</span><a id=\"line.26\">public class ConcealedClassInModuleA {</a>\n"
|
||||
+ "<span class=\"sourceLineNo\">027</span><a id=\"line.27\"> public void testMethodConcealedClass() { }</a>\n"
|
||||
+ "<span class=\"sourceLineNo\">028</span><a id=\"line.28\">}</a>");
|
||||
"<span class=\"sourceLineNo\">024</span><span id=\"line.24\">package concealedpkgmdlA;</span>\n"
|
||||
+ "<span class=\"sourceLineNo\">025</span><span id=\"line.25\"></span>\n"
|
||||
+ "<span class=\"sourceLineNo\">026</span><span id=\"line.26\">public class ConcealedClassInModuleA {</span>\n"
|
||||
+ "<span class=\"sourceLineNo\">027</span><span id=\"line.27\"> public void testMethodConcealedClass() { }</span>\n"
|
||||
+ "<span class=\"sourceLineNo\">028</span><span id=\"line.28\">}</span>");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -62,32 +62,29 @@ public class TestNavigation extends JavadocTester {
|
||||
checkSubNav();
|
||||
|
||||
checkOutput("pkg/A.html", true,
|
||||
"<ul class=\"navList\" title=\"Navigation\">\n" +
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" +
|
||||
"<li><a href=\"../index.html\">Overview</a></li>");
|
||||
|
||||
checkOutput("pkg/C.html", true,
|
||||
"<ul class=\"navList\" title=\"Navigation\">\n" +
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" +
|
||||
"<li><a href=\"../index.html\">Overview</a></li>");
|
||||
|
||||
checkOutput("pkg/E.html", true,
|
||||
"<ul class=\"navList\" title=\"Navigation\">\n" +
|
||||
"<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" +
|
||||
"<li><a href=\"../index.html\">Overview</a></li>");
|
||||
|
||||
checkOutput("pkg/I.html", true,
|
||||
// Test for 4664607
|
||||
"<div class=\"skipNav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>\n"
|
||||
+ "<a id=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>",
|
||||
+ "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
|
||||
"<li><a href=\"../index.html\">Overview</a></li>");
|
||||
|
||||
// Remaining tests check for additional padding to offset the fixed navigation bar.
|
||||
checkOutput("pkg/A.html", true,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
|
||||
+ "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a></div>\n"
|
||||
+ "</nav>\n"
|
||||
+ "</span></nav>\n"
|
||||
+ "</header>\n"
|
||||
+ "<div class=\"flexContent\">\n"
|
||||
+ "<main role=\"main\">\n"
|
||||
@ -95,10 +92,9 @@ public class TestNavigation extends JavadocTester {
|
||||
|
||||
checkOutput("pkg/package-summary.html", true,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
|
||||
+ "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a></div>\n"
|
||||
+ "</nav>\n"
|
||||
+ "</span></nav>\n"
|
||||
+ "</header>\n"
|
||||
+ "<div class=\"flexContent\">\n"
|
||||
+ "<main role=\"main\">\n"
|
||||
@ -117,10 +113,9 @@ public class TestNavigation extends JavadocTester {
|
||||
|
||||
checkOutput("pkg/A.html", true,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
|
||||
+ "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a></div>\n"
|
||||
+ "</nav>\n"
|
||||
+ "</span></nav>\n"
|
||||
+ "</header>\n"
|
||||
+ "<div class=\"flexContent\">\n"
|
||||
+ "<main role=\"main\">\n"
|
||||
@ -128,10 +123,9 @@ public class TestNavigation extends JavadocTester {
|
||||
|
||||
checkOutput("pkg/package-summary.html", true,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
|
||||
+ "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a></div>\n"
|
||||
+ "</nav>");
|
||||
+ "</span></nav>\n");
|
||||
}
|
||||
|
||||
// Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified.
|
||||
@ -284,5 +278,5 @@ public class TestNavigation extends JavadocTester {
|
||||
+ " allClassesLink = document.getElementById(\"allclasses_navbar_top\");",
|
||||
"<script type=\"text/javascript\"><!--\n"
|
||||
+ " allClassesLink = document.getElementById(\"allclasses_navbar_bottom\");");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -192,19 +192,21 @@ public class TestOptions extends JavadocTester {
|
||||
"<pre>@Documented\npublic @interface <a href="
|
||||
+ "\"../src-html/linksource/AnnotationTypeField.html#line.31\">"
|
||||
+ "AnnotationTypeField</a></pre>",
|
||||
"<h3><a id=\"DEFAULT_NAME\">DEFAULT_NAME</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"DEFAULT_NAME\">\n"
|
||||
+ "<h3>DEFAULT_NAME</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> "
|
||||
+ "<span class=\"returnType\">java.lang.String</span> <span class=\"memberName\">"
|
||||
+ "<a href=\"../src-html/linksource/AnnotationTypeField.html#line.32\">DEFAULT_NAME</a></span></div>",
|
||||
"<h3><a id=\"name()\">name</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"name()\">\n"
|
||||
+ "<h3>name</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span> "
|
||||
+ "<span class=\"memberName\"><a href=\"../src-html/linksource/AnnotationTypeField.html#line.34\">"
|
||||
+ "name</a></span></div>");
|
||||
|
||||
checkOutput("src-html/linksource/AnnotationTypeField.html", true,
|
||||
"<title>Source code</title>",
|
||||
"<span class=\"sourceLineNo\">031</span><a id=\"line.31\">"
|
||||
+ "@Documented public @interface AnnotationTypeField {</a>");
|
||||
"<span class=\"sourceLineNo\">031</span><span id=\"line.31\">"
|
||||
+ "@Documented public @interface AnnotationTypeField {</span>");
|
||||
|
||||
checkOutput("linksource/Properties.html", true,
|
||||
"<pre>public class <a href=\"../src-html/linksource/Properties.html#line.29\">"
|
||||
@ -215,8 +217,8 @@ public class TestOptions extends JavadocTester {
|
||||
|
||||
checkOutput("src-html/linksource/Properties.html", true,
|
||||
"<title>Source code</title>",
|
||||
"<span class=\"sourceLineNo\">031</span><a id=\"line.31\"> "
|
||||
+ "public Object someProperty() {</a>");
|
||||
"<span class=\"sourceLineNo\">031</span><span id=\"line.31\"> "
|
||||
+ "public Object someProperty() {</span>");
|
||||
|
||||
checkOutput("linksource/SomeClass.html", true,
|
||||
"<pre>public class <a href=\"../src-html/linksource/SomeClass.html#line.29\">"
|
||||
@ -233,14 +235,14 @@ public class TestOptions extends JavadocTester {
|
||||
|
||||
checkOutput("src-html/linksource/SomeClass.html", true,
|
||||
"<title>Source code</title>",
|
||||
"<span class=\"sourceLineNo\">029</span><a id=\"line.29\">"
|
||||
+ "public class SomeClass {</a>",
|
||||
"<span class=\"sourceLineNo\">031</span><a id=\"line.31\"> "
|
||||
+ "public int field;</a>",
|
||||
"<span class=\"sourceLineNo\">033</span><a id=\"line.33\"> "
|
||||
+ "public SomeClass() {</a>",
|
||||
"<span class=\"sourceLineNo\">036</span><a id=\"line.36\"> "
|
||||
+ "public int method() {</a>");
|
||||
"<span class=\"sourceLineNo\">029</span><span id=\"line.29\">"
|
||||
+ "public class SomeClass {</span>",
|
||||
"<span class=\"sourceLineNo\">031</span><span id=\"line.31\"> "
|
||||
+ "public int field;</span>",
|
||||
"<span class=\"sourceLineNo\">033</span><span id=\"line.33\"> "
|
||||
+ "public SomeClass() {</span>",
|
||||
"<span class=\"sourceLineNo\">036</span><span id=\"line.36\"> "
|
||||
+ "public int method() {</span>");
|
||||
|
||||
checkOutput("linksource/SomeEnum.html", true,
|
||||
"<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span> "
|
||||
@ -253,8 +255,8 @@ public class TestOptions extends JavadocTester {
|
||||
+ "<a href=\"../src-html/linksource/SomeEnum.html#line.30\">VALUE2</a></span></div>");
|
||||
|
||||
checkOutput("src-html/linksource/SomeEnum.html", true,
|
||||
"<span class=\"sourceLineNo\">029</span><a id=\"line.29\"> VALUE1,</a>",
|
||||
"<span class=\"sourceLineNo\">030</span><a id=\"line.30\"> VALUE2</a>");
|
||||
"<span class=\"sourceLineNo\">029</span><span id=\"line.29\"> VALUE1,</span>",
|
||||
"<span class=\"sourceLineNo\">030</span><span id=\"line.30\"> VALUE2</span>");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -532,10 +532,10 @@ public class TestOrdering extends JavadocTester {
|
||||
"<a href=\"#three()\">three</a>",
|
||||
"<a href=\"#two()\">two</a>",
|
||||
"<h2>Element Details</h2>",
|
||||
"<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>");
|
||||
"<h3>one</h3>",
|
||||
"<h3>two</h3>",
|
||||
"<h3>three</h3>",
|
||||
"<h3>four</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><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>");
|
||||
"<h3>one</h3>",
|
||||
"<h3>two</h3>",
|
||||
"<h3>three</h3>",
|
||||
"<h3>four</h3>");
|
||||
|
||||
checkOrder("pkg5/CtorTest.html",
|
||||
"<h2>Constructor Summary</h2>",
|
||||
@ -556,10 +556,10 @@ public class TestOrdering extends JavadocTester {
|
||||
"<a href=\"#%3Cinit%3E(int,int,int)\"",
|
||||
"<a href=\"#%3Cinit%3E(int,int,int,int)\"",
|
||||
"<h2>Constructor Details</h2>",
|
||||
"<a id=\"<init>(int,int,int,int)\">",
|
||||
"<a id=\"<init>(int,int,int)\">",
|
||||
"<a id=\"<init>(int,int)\">",
|
||||
"<a id=\"<init>(int)\">");
|
||||
"<section class=\"detail\" id=\"<init>(int,int,int,int)\">",
|
||||
"<section class=\"detail\" id=\"<init>(int,int,int)\">",
|
||||
"<section class=\"detail\" id=\"<init>(int,int)\">",
|
||||
"<section class=\"detail\" id=\"<init>(int)\">");
|
||||
|
||||
checkOrder("pkg5/EnumTest.html",
|
||||
"<h2>Enum Constant 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><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>");
|
||||
"<h3>ONE</h3>",
|
||||
"<h3>TWO</h3>",
|
||||
"<h3>THREE</h3>",
|
||||
"<h3>FOUR</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><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>");
|
||||
"<h3>one</h3>",
|
||||
"<h3>two</h3>",
|
||||
"<h3>three</h3>",
|
||||
"<h3>four</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><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>");
|
||||
"<h3>one</h3>",
|
||||
"<h3>two</h3>",
|
||||
"<h3>three</h3>",
|
||||
"<h3>four</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><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>");
|
||||
"<h3>one</h3>",
|
||||
"<h3>two</h3>",
|
||||
"<h3>three</h3>",
|
||||
"<h3>four</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><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>");
|
||||
"<h3>oneProperty</h3>",
|
||||
"<h3>twoProperty</h3>",
|
||||
"<h3>threeProperty</h3>",
|
||||
"<h3>fourProperty</h3>");
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -52,8 +52,8 @@ public class TestBadOverride extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("pkg4/Foo.html", true,
|
||||
"<section class=\"detail\">\n"
|
||||
+ "<h3><a id=\"toString()\">toString</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"toString()\">\n"
|
||||
+ "<h3>toString</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
|
||||
+ "<span class=\"returnType\">void</span> <span class=\"memberName\">toString</span>()</div>\n"
|
||||
+ "<div class=\"block\">Why can't I do this ?</div>\n"
|
||||
|
||||
@ -231,7 +231,7 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
|
||||
// Test synthetic values and valuesof of an enum.
|
||||
checkOrder("index-all.html",
|
||||
"<h2 class=\"title\">M</h2>",
|
||||
"<h2 class=\"title\" id=\"I:M\">M</h2>",
|
||||
"<a href=\"pkg5/Interfaces.C.html#m()\">m()",
|
||||
"<a href=\"pkg5/Interfaces.D.html#m()\">m()</a>",
|
||||
"<a href=\"pkg5/Classes.GP.html#m0()\">m0()",
|
||||
@ -279,9 +279,8 @@ public class TestOverrideMethods extends JavadocTester {
|
||||
+ "</tbody>\n"
|
||||
+ "</table>\n",
|
||||
"<div class=\"inheritedList\">\n"
|
||||
+ "<h3>Methods declared in class pkg6.<a href=\"Base.html\" title=\"class in pkg6\">Base</a></h3>\n"
|
||||
+ "<a id=\"methods.inherited.from.class.pkg6.Base\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a><code><a href=\"Base.html#m1()\">m1</a>, <a href=\"Base.html#m3()\">m3</a></code></div>\n");
|
||||
+ "<h3 id=\"methods.inherited.from.class.pkg6.Base\">Methods declared in class pkg6."
|
||||
+ "<a href=\"Base.html\" title=\"class in pkg6\">Base</a></h3>\n"
|
||||
+ "<code><a href=\"Base.html#m1()\">m1</a>, <a href=\"Base.html#m3()\">m3</a></code></div>\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -48,9 +48,7 @@ public class TestPackageDescription extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("pkg/package-summary.html", true,
|
||||
"<a id=\"package.description\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"packageDescription\" id=\"package.description\">\n"
|
||||
+ "<div class=\"block\">package description</div>\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -138,7 +138,7 @@ public class TestRecordTypes extends JavadocTester {
|
||||
"public record <span class=\"typeNameLabel\">R</span>",
|
||||
"<dl>\n"
|
||||
+ "<dt><span class=\"paramLabel\">Record Components:</span></dt>\n"
|
||||
+ "<dd><code><a id=\"param-r1\">r1</a></code> - This is a component.</dd>\n"
|
||||
+ "<dd><code><span id=\"param-r1\">r1</span></code> - This is a component.</dd>\n"
|
||||
+ "</dl>",
|
||||
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E(int)\">R</a></span>​(int r1)</code>");
|
||||
}
|
||||
@ -167,7 +167,7 @@ public class TestRecordTypes extends JavadocTester {
|
||||
+ "<dt><span class=\"paramLabel\">Type Parameters:</span></dt>\n"
|
||||
+ "<dd><code>T</code> - This is a type parameter.</dd>\n"
|
||||
+ "<dt><span class=\"paramLabel\">Record Components:</span></dt>\n"
|
||||
+ "<dd><code><a id=\"param-r1\">r1</a></code> - This is a component.</dd>\n"
|
||||
+ "<dd><code><span id=\"param-r1\">r1</span></code> - This is a component.</dd>\n"
|
||||
+ "</dl>",
|
||||
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E(int)\">R</a></span>​(int r1)</code>");
|
||||
}
|
||||
@ -192,10 +192,10 @@ public class TestRecordTypes extends JavadocTester {
|
||||
// in these cases, we want to verify that something non-empty was put into
|
||||
// the documentation for the generated members.
|
||||
checkOrder("p/R.html",
|
||||
"<section class=\"constructorSummary\">",
|
||||
"<section class=\"constructorSummary\" id=\"constructor.summary\">",
|
||||
"<a href=\"#%3Cinit%3E(int)\">R</a>",
|
||||
"Creates an instance of a <code>R</code> record.",
|
||||
"<section class=\"methodSummary\">",
|
||||
"<section class=\"methodSummary\" id=\"method.summary\">",
|
||||
"<a href=\"#equals(java.lang.Object)\">equals</a>",
|
||||
"Indicates whether some other object is \"equal to\" this one.",
|
||||
"<a href=\"#hashCode()\">hashCode</a>",
|
||||
@ -244,10 +244,10 @@ public class TestRecordTypes extends JavadocTester {
|
||||
// in these cases, we want to verify that something non-empty was put into
|
||||
// the documentation for the generated members.
|
||||
checkOrder("p/R.html",
|
||||
"<section class=\"constructorSummary\">",
|
||||
"<section class=\"constructorSummary\" id=\"constructor.summary\">",
|
||||
"<a href=\"#%3Cinit%3E(int)\">R</a>",
|
||||
"Creates an instance of a <code>R</code> record.",
|
||||
"<section class=\"methodSummary\">",
|
||||
"<section class=\"methodSummary\" id=\"method.summary\">",
|
||||
"<a href=\"#equals(java.lang.Object)\">equals</a>",
|
||||
"Indicates whether some other object is \"equal to\" this one.",
|
||||
"<a href=\"#hashCode()\">hashCode</a>",
|
||||
@ -334,10 +334,10 @@ public class TestRecordTypes extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOrder("p/R.html",
|
||||
"<section class=\"constructorSummary\">",
|
||||
"<section class=\"constructorSummary\" id=\"constructor.summary\">",
|
||||
"<a href=\"#%3Cinit%3E(int)\">R</a>",
|
||||
"User constructor.",
|
||||
"<section class=\"methodSummary\">",
|
||||
"<section class=\"methodSummary\" id=\"method.summary\">",
|
||||
"<a href=\"#equals(java.lang.Object)\">equals</a>",
|
||||
"User equals.",
|
||||
"<a href=\"#hashCode()\">hashCode</a>",
|
||||
|
||||
@ -434,9 +434,9 @@ public class TestSearch extends JavadocTester {
|
||||
+ "pkg2.<a href=\"pkg2/TestEnum.html\" title=\"enum in pkg2\">TestEnum</a></dt>");
|
||||
checkOutput("index-all.html", true,
|
||||
"<div class=\"deprecationComment\">class_test1 passes. Search tag"
|
||||
+ " <a id=\"SearchTagDeprecatedClass\" class=\"searchTagResult\">SearchTagDeprecatedClass</a></div>",
|
||||
+ " <span id=\"SearchTagDeprecatedClass\" class=\"searchTagResult\">SearchTagDeprecatedClass</span></div>",
|
||||
"<div class=\"deprecationComment\">error_test3 passes. Search tag for\n"
|
||||
+ " method <a id=\"SearchTagDeprecatedMethod\" class=\"searchTagResult\">SearchTagDeprecatedMethod</a></div>");
|
||||
+ " method <span id=\"SearchTagDeprecatedMethod\" class=\"searchTagResult\">SearchTagDeprecatedMethod</span></div>");
|
||||
}
|
||||
|
||||
void checkSplitIndex() {
|
||||
@ -516,9 +516,9 @@ public class TestSearch extends JavadocTester {
|
||||
"<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#SingleWord\">"
|
||||
+ "SingleWord</a></span> - Search tag in package pkg</dt>",
|
||||
"<div class=\"deprecationComment\">class_test1 passes. Search tag"
|
||||
+ " <a id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</a></div>",
|
||||
+ " <span id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</span></div>",
|
||||
"<div class=\"deprecationComment\">error_test3 passes. Search tag for\n"
|
||||
+ " method <a id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</a></div>");
|
||||
+ " method <span id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</span></div>");
|
||||
checkOutput("index-all.html", true,
|
||||
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">"
|
||||
+ "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
|
||||
@ -547,9 +547,9 @@ public class TestSearch extends JavadocTester {
|
||||
"<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
|
||||
+ "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError.TestError()</dt>",
|
||||
"<div class=\"deprecationComment\">class_test1 passes. Search tag"
|
||||
+ " <a id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</a></div>",
|
||||
+ " <span id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</span></div>",
|
||||
"<div class=\"deprecationComment\">error_test3 passes. Search tag for\n"
|
||||
+ " method <a id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</a></div>");
|
||||
+ " method <span id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</span></div>");
|
||||
}
|
||||
|
||||
void checkJavaFXOutput() {
|
||||
|
||||
@ -85,8 +85,8 @@ 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><a id=\"m3()\">m3</a></h3>\n"
|
||||
"<section class=\"detail\" id=\"m3()\">\n"
|
||||
+ "<h3>m3</h3>\n"
|
||||
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
|
||||
+ "<span class=\"returnType\">void</span> <span class=\"memberName\">m3</span>()</div>\n"
|
||||
+ "<div class=\"block\">First sentence some text maybe second sentence.</div>\n"
|
||||
|
||||
@ -63,67 +63,67 @@ public class TestSystemPropertyTaglet extends JavadocTester {
|
||||
|
||||
checkOrder("mymodule/mypackage/MyAnnotation.html",
|
||||
"<h1 title=\"Annotation Type MyAnnotation\" class=\"title\">Annotation Type MyAnnotation</h1>",
|
||||
"(annotation) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(annotation) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"<h2>Element Details</h2>",
|
||||
"(annotation/method) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(annotation/method) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"");
|
||||
|
||||
checkOrder("mymodule/mypackage/MyClass.html",
|
||||
"<h1 title=\"Class MyClass\" class=\"title\">Class MyClass</h1>",
|
||||
"(class) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(class) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"<h2>Field Details</h2>",
|
||||
"(class/field) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(class/static-field) the <code><a id=\"test.property-2\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(class/field) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"(class/static-field) the <code><span id=\"test.property-2\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"<h2>Constructor Details</h2>",
|
||||
"(class/constructor) the <code><a id=\"test.property-3\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(class/constructor) the <code><span id=\"test.property-3\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"<h2>Method Details</h2>",
|
||||
"(class/static-method) the <code><a id=\"test.property-4\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(class/method) the <code><a id=\"test.property-5\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(class/static-method) the <code><span id=\"test.property-4\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"(class/method) the <code><span id=\"test.property-5\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"");
|
||||
|
||||
checkOrder("mymodule/mypackage/MyEnum.html",
|
||||
"<h1 title=\"Enum MyEnum\" class=\"title\">Enum MyEnum</h1>",
|
||||
"(enum) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(enum) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"<h2>Enum Constant Details</h2>",
|
||||
"(enum/constant) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(enum/constant) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"");
|
||||
|
||||
checkOrder("mymodule/mypackage/MyError.html",
|
||||
"<h1 title=\"Class MyError\" class=\"title\">Class MyError</h1>",
|
||||
"(error) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(error) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"<h2>Constructor Details</h2>",
|
||||
"(error/constructor) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(error/constructor) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"");
|
||||
|
||||
checkOrder("mymodule/mypackage/MyException.html",
|
||||
"<h1 title=\"Class MyException\" class=\"title\">Class MyException</h1>",
|
||||
"(exception) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(exception) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"<h2>Constructor Details</h2>",
|
||||
"(exception/constructor) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code>",
|
||||
"(exception/constructor) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code>",
|
||||
"");
|
||||
|
||||
checkOrder("mymodule/mypackage/MyInterface.html",
|
||||
"<h1 title=\"Interface MyInterface\" class=\"title\">Interface MyInterface</h1>",
|
||||
"(interface) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(interface) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"<h2>Field Details</h2>",
|
||||
"(interface/constant) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(interface/constant) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"<h2>Method Details</h2>",
|
||||
"(interface/method-1) the <code><a id=\"test.property-2\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(interface/method-2) the <code><a id=\"test.property-3\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(interface/method-1) the <code><span id=\"test.property-2\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"(interface/method-2) the <code><span id=\"test.property-3\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"");
|
||||
|
||||
checkOrder("mymodule/module-summary.html",
|
||||
"<h1 title=\"Module\" class=\"title\">Module mymodule</h1>",
|
||||
"(module) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(module) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"");
|
||||
|
||||
checkOrder("mymodule/mypackage/package-summary.html",
|
||||
"<h1 title=\"Package\" class=\"title\">Package mypackage</h1>",
|
||||
"(package) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
|
||||
"(package) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
|
||||
"");
|
||||
|
||||
checkOrder("index-all.html",
|
||||
"<h2 class=\"title\">T</h2>",
|
||||
"<h2 class=\"title\" id=\"I:T\">T</h2>",
|
||||
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyAnnotation.html#test.property\">test.property</a></span>" +
|
||||
" - Search tag in annotation type mypackage.MyAnnotation</dt>\n<dd>System Property</dd>",
|
||||
"<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyClass.html#test.property\">test.property</a></span>" +
|
||||
|
||||
@ -69,7 +69,8 @@ public class TestTypeParameters extends JavadocTester {
|
||||
|
||||
// Nested type parameters
|
||||
checkOutput("pkg/C.html", true,
|
||||
"<a id=\"formatDetails(java.util.Collection,java.util.Collection)\">");
|
||||
"<section class=\"detail\" id=\"formatDetails(java.util.Collection,java.util.Collection)\">\n"
|
||||
+ "<h3>formatDetails</h3>");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -150,7 +150,7 @@ public class TestUseOption extends JavadocTester {
|
||||
);
|
||||
checkOutput("class-use/UsedInC.html", true,
|
||||
"<li class=\"blockList\">\n"
|
||||
+ "<section class=\"detail\"><a id=\"unnamed.package\">"
|
||||
+ "<section class=\"detail\" id=\"unnamed.package\">\n"
|
||||
);
|
||||
checkOutput("package-use.html", true,
|
||||
"<th class=\"colFirst\" scope=\"row\">"
|
||||
|
||||
@ -68,9 +68,8 @@ public class TestValueTagInModule extends JavadocTester {
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("m1/module-summary.html", true,
|
||||
"<a id=\"module.description\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>\n"
|
||||
"<section class=\"moduleDescription\" id=\"module.description\">\n"
|
||||
+ "<!-- ============ MODULE DESCRIPTION =========== -->\n"
|
||||
+ "<div class=\"block\">value of field CONS : <a href=\"pkg/A.html#CONS\">100</a></div>");
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user