8203791: Remove "compatibility" features from Table.java
Reviewed-by: jjg
This commit is contained in:
parent
73477220be
commit
38f91617c5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html
AllClassesIndexWriter.javaAnnotationTypeFieldWriterImpl.javaAnnotationTypeRequiredMemberWriterImpl.javaConstructorWriterImpl.javaEnumConstantWriterImpl.javaFieldWriterImpl.javaMethodWriterImpl.javaNestedClassWriterImpl.javaPropertyWriterImpl.java
markup
test/langtools/jdk/javadoc/doclet
testJavaFX
testMethodTypes
testProperty
testUnnamedPackage
4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
@ -150,9 +150,7 @@ public class AllClassesIndexWriter extends HtmlDocletWriter {
|
||||
.addTab(resources.exceptionSummary, e -> utils.isException((TypeElement)e))
|
||||
.addTab(resources.errorSummary, e -> utils.isError((TypeElement)e))
|
||||
.addTab(resources.annotationTypeSummary, utils::isAnnotationType)
|
||||
.setTabScript(i -> "show(" + i + ");")
|
||||
.setUseTBody(false)
|
||||
.setPutIdFirst(true);
|
||||
.setTabScript(i -> "show(" + i + ");");
|
||||
for (Character unicode : indexbuilder.index()) {
|
||||
for (Element element : indexbuilder.getMemberList(unicode)) {
|
||||
TypeElement typeElement = (TypeElement) element;
|
||||
|
@ -221,8 +221,7 @@ public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
|
||||
.setCaption(caption)
|
||||
.setHeader(header)
|
||||
.setRowScopeColumn(1)
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast)
|
||||
.setUseTBody(false); // temporary? compatibility mode for TBody
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -242,8 +242,7 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
|
||||
.setCaption(getCaption())
|
||||
.setHeader(getSummaryTableHeader(typeElement))
|
||||
.setRowScopeColumn(1)
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast)
|
||||
.setUseTBody(false); // temporary? compatibility mode for TBody
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);
|
||||
}
|
||||
|
||||
/**
|
||||
|
3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
@ -268,8 +268,7 @@ public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
|
||||
.setCaption(contents.constructors)
|
||||
.setHeader(getSummaryTableHeader(typeElement))
|
||||
.setRowScopeColumn(rowScopeColumn)
|
||||
.setColumnStyles(bodyRowStyles)
|
||||
.setUseTBody(false); // temporary? compatibility mode for TBody
|
||||
.setColumnStyles(bodyRowStyles);
|
||||
}
|
||||
|
||||
/**
|
||||
|
3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
@ -212,8 +212,7 @@ public class EnumConstantWriterImpl extends AbstractMemberWriter
|
||||
.setSummary(summary)
|
||||
.setCaption(contents.getContent("doclet.Enum_Constants"))
|
||||
.setHeader(getSummaryTableHeader(typeElement))
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
|
||||
.setUseTBody(false);
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -218,8 +218,7 @@ public class FieldWriterImpl extends AbstractMemberWriter
|
||||
.setCaption(contents.fields)
|
||||
.setHeader(getSummaryTableHeader(typeElement))
|
||||
.setRowScopeColumn(1)
|
||||
.setColumnStyles(bodyRowStyles)
|
||||
.setUseTBody(false); // temporary? compatibility mode for TBody
|
||||
.setColumnStyles(bodyRowStyles);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -267,9 +267,7 @@ public class MethodWriterImpl extends AbstractExecutableMemberWriter
|
||||
.addTab(resources.getText("doclet.Default_Methods"), utils::isDefault)
|
||||
.addTab(resources.getText("doclet.Deprecated_Methods"),
|
||||
e -> utils.isDeprecated(e) || utils.isDeprecated(typeElement))
|
||||
.setTabScript(i -> "show(" + i + ");")
|
||||
.setUseTBody(false)
|
||||
.setPutIdFirst(true);
|
||||
.setTabScript(i -> "show(" + i + ");");
|
||||
}
|
||||
|
||||
/**
|
||||
|
3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
@ -121,8 +121,7 @@ public class NestedClassWriterImpl extends AbstractMemberWriter
|
||||
.setCaption(contents.getContent("doclet.Nested_Classes"))
|
||||
.setHeader(getSummaryTableHeader(typeElement))
|
||||
.setRowScopeColumn(1)
|
||||
.setColumnStyles(bodyRowStyles)
|
||||
.setUseTBody(false); // temporary? compatibility mode for TBody
|
||||
.setColumnStyles(bodyRowStyles);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -232,8 +232,7 @@ public class PropertyWriterImpl extends AbstractMemberWriter
|
||||
.setCaption(contents.properties)
|
||||
.setHeader(getSummaryTableHeader(typeElement))
|
||||
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast)
|
||||
.setRowScopeColumn(1)
|
||||
.setUseTBody(false);
|
||||
.setRowScopeColumn(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -81,10 +81,6 @@ public class Table {
|
||||
private final List<Integer> bodyRowMasks;
|
||||
private String rowIdPrefix = "i";
|
||||
|
||||
// compatibility flags
|
||||
private boolean putIdFirst = false;
|
||||
private boolean useTBody = true;
|
||||
|
||||
/**
|
||||
* Creates a builder for an HTML table.
|
||||
*
|
||||
@ -301,37 +297,6 @@ public class Table {
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets whether the {@code id} attribute should appear first in a {@code <tr>} tag.
|
||||
* The default is {@code false}.
|
||||
*
|
||||
* <b>This is a compatibility feature that should be removed when all tables use a
|
||||
* consistent policy.</b>
|
||||
*
|
||||
* @param first whether to put {@code id} attributes first
|
||||
* @return this object
|
||||
*/
|
||||
public Table setPutIdFirst(boolean first) {
|
||||
this.putIdFirst = first;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets whether or not to use an explicit {@code <tbody>} element to enclose the rows
|
||||
* of a table.
|
||||
* The default is {@code true}.
|
||||
*
|
||||
* <b>This is a compatibility feature that should be removed when all tables use a
|
||||
* consistent policy.</b>
|
||||
*
|
||||
* @param use whether o use a {@code <tbody> element
|
||||
* @return this object
|
||||
*/
|
||||
public Table setUseTBody(boolean use) {
|
||||
this.useTBody = use;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a row of data to the table.
|
||||
* Each item of content should be suitable for use as the content of a
|
||||
@ -399,11 +364,6 @@ public class Table {
|
||||
|
||||
HtmlTree row = new HtmlTree(HtmlTag.TR);
|
||||
|
||||
if (putIdFirst && tabMap != null) {
|
||||
int index = bodyRows.size();
|
||||
row.addAttr(HtmlAttr.ID, (rowIdPrefix + index));
|
||||
}
|
||||
|
||||
if (stripedStyles != null) {
|
||||
int rowIndex = bodyRows.size();
|
||||
row.addAttr(HtmlAttr.CLASS, stripedStyles.get(rowIndex % 2).name());
|
||||
@ -422,10 +382,8 @@ public class Table {
|
||||
bodyRows.add(row);
|
||||
|
||||
if (tabMap != null) {
|
||||
if (!putIdFirst) {
|
||||
int index = bodyRows.size() - 1;
|
||||
row.addAttr(HtmlAttr.ID, (rowIdPrefix + index));
|
||||
}
|
||||
int index = bodyRows.size() - 1;
|
||||
row.addAttr(HtmlAttr.ID, (rowIdPrefix + index));
|
||||
int mask = 0;
|
||||
int maskBit = 1;
|
||||
for (Map.Entry<String, Predicate<Element>> e : tabMap.entrySet()) {
|
||||
@ -493,13 +451,10 @@ public class Table {
|
||||
table.addContent(caption);
|
||||
}
|
||||
table.addContent(header.toContent());
|
||||
if (useTBody) {
|
||||
Content tbody = new HtmlTree(HtmlTag.TBODY);
|
||||
bodyRows.forEach(row -> tbody.addContent(row));
|
||||
table.addContent(tbody);
|
||||
} else {
|
||||
bodyRows.forEach(row -> table.addContent(row));
|
||||
}
|
||||
Content tbody = new HtmlTree(HtmlTag.TBODY);
|
||||
bodyRows.forEach(row -> tbody.addContent(row));
|
||||
table.addContent(tbody);
|
||||
|
||||
return table;
|
||||
}
|
||||
|
||||
|
@ -25,6 +25,7 @@
|
||||
* @test
|
||||
* @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363
|
||||
* 8167967 8172528 8175200 8178830 8182257 8186332 8182765 8025091
|
||||
* 8203791
|
||||
* @summary Test of the JavaFX doclet features.
|
||||
* @author jvalenta
|
||||
* @library ../lib
|
||||
@ -316,27 +317,28 @@ public class TestJavaFX extends JavadocTester {
|
||||
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
|
||||
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i0\" class=\"altColor\">\n"
|
||||
+ "<tbody>\n"
|
||||
+ "<tr class=\"altColor\" id=\"i0\">\n"
|
||||
+ "<td class=\"colFirst\"><code><T> java.lang.Object</code></td>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"#alphaProperty(java.util.List)\">alphaProperty</a>"
|
||||
+ "</span>​(java.util.List<T> foo)</code></th>\n"
|
||||
+ "<td class=\"colLast\"> </td>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i1\" class=\"rowColor\">\n"
|
||||
+ "<tr class=\"rowColor\" id=\"i1\">\n"
|
||||
+ "<td class=\"colFirst\"><code>java.lang.Object</code></td>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"#betaProperty()\">betaProperty</a></span>()</code></th>\n"
|
||||
+ "<td class=\"colLast\"> </td>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i2\" class=\"altColor\">\n"
|
||||
+ "<tr class=\"altColor\" id=\"i2\">\n"
|
||||
+ "<td class=\"colFirst\"><code>java.util.List<java.util.Set<? super java.lang.Object>>"
|
||||
+ "</code></td>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"#deltaProperty()\">deltaProperty</a></span>()</code></th>\n"
|
||||
+ "<td class=\"colLast\"> </td>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i3\" class=\"rowColor\">\n"
|
||||
+ "<tr class=\"rowColor\" id=\"i3\">\n"
|
||||
+ "<td class=\"colFirst\"><code>java.util.List<java.lang.String></code></td>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"#gammaProperty()\">gammaProperty</a></span>()</code></th>\n"
|
||||
@ -357,27 +359,28 @@ public class TestJavaFX extends JavadocTester {
|
||||
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
|
||||
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i0\" class=\"altColor\">\n"
|
||||
+ "<tbody>\n"
|
||||
+ "<tr class=\"altColor\" id=\"i0\">\n"
|
||||
+ "<td class=\"colFirst\"><code><T> java.lang.Object</code></td>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"#alphaProperty-java.util.List-\">alphaProperty</a>"
|
||||
+ "</span>​(java.util.List<T> foo)</code></th>\n"
|
||||
+ "<td class=\"colLast\"> </td>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i1\" class=\"rowColor\">\n"
|
||||
+ "<tr class=\"rowColor\" id=\"i1\">\n"
|
||||
+ "<td class=\"colFirst\"><code>java.lang.Object</code></td>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"#betaProperty--\">betaProperty</a></span>()</code></th>\n"
|
||||
+ "<td class=\"colLast\"> </td>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i2\" class=\"altColor\">\n"
|
||||
+ "<tr class=\"altColor\" id=\"i2\">\n"
|
||||
+ "<td class=\"colFirst\"><code>java.util.List<java.util.Set<? super java.lang.Object>>"
|
||||
+ "</code></td>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"#deltaProperty--\">deltaProperty</a></span>()</code></th>\n"
|
||||
+ "<td class=\"colLast\"> </td>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i3\" class=\"rowColor\">\n"
|
||||
+ "<tr class=\"rowColor\" id=\"i3\">\n"
|
||||
+ "<td class=\"colFirst\"><code>java.util.List<java.lang.String></code></td>\n"
|
||||
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
|
||||
+ "<a href=\"#gammaProperty--\">gammaProperty</a></span>()</code></th>\n"
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8002304 8024096 8193671 8196201
|
||||
* @bug 8002304 8024096 8193671 8196201 8203791
|
||||
* @summary Test for various method type tabs in the method summary table
|
||||
* @author Bhavesh Patel
|
||||
* @library ../lib
|
||||
@ -59,7 +59,7 @@ public class TestMethodTypes extends JavadocTester {
|
||||
+ "<span id=\"t6\" class=\"tableTab\"><span><a href=\"javascript:show(32);\">"
|
||||
+ "Deprecated Methods</a></span><span class=\"tabEnd\"> </span></span>"
|
||||
+ "</caption>",
|
||||
"<tr id=\"i0\" class=\"altColor\">");
|
||||
"<tr class=\"altColor\" id=\"i0\">");
|
||||
|
||||
checkOutput("pkg1/B.html", true,
|
||||
"var data = {\"i0\":6,\"i1\":18,\"i2\":18,\"i3\":1,\"i4\":1,"
|
||||
@ -88,7 +88,7 @@ public class TestMethodTypes extends JavadocTester {
|
||||
+ "<span id=\"t6\" class=\"tableTab\"><span><a href=\"javascript:show(32);\">"
|
||||
+ "Deprecated Methods</a></span><span class=\"tabEnd\"> </span></span>"
|
||||
+ "</caption>",
|
||||
"<tr id=\"i0\" class=\"altColor\">");
|
||||
"<tr class=\"altColor\" id=\"i0\">");
|
||||
|
||||
checkOutput("pkg1/A.html", false,
|
||||
"<caption><span>Methods</span><span class=\"tabEnd\"> </span>"
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8176231 8189843 8182765
|
||||
* @bug 8176231 8189843 8182765 8203791
|
||||
* @summary Test JavaFX property.
|
||||
* @library ../lib/
|
||||
* @modules jdk.javadoc/jdk.javadoc.internal.tool
|
||||
@ -83,7 +83,7 @@ public class TestProperty extends JavadocTester {
|
||||
+ "<a href=\"#badProperty\">bad</a></span></code></th>",
|
||||
|
||||
// id should be used in the method table
|
||||
"<tr id=\"i0\" class=\"altColor\">\n"
|
||||
"<tr class=\"altColor\" id=\"i0\">\n"
|
||||
+ "<td class=\"colFirst\"><code><a href=\"ObjectProperty.html\" "
|
||||
+ "title=\"class in pkg\">ObjectProperty</a><<a href=\"MyObj.html\" "
|
||||
+ "title=\"class in pkg\">MyObj</a>[]></code></td>\n"
|
||||
@ -147,7 +147,7 @@ public class TestProperty extends JavadocTester {
|
||||
+ "</dl>",
|
||||
|
||||
// id should be used in the method table
|
||||
"<tr id=\"i0\" class=\"altColor\">\n"
|
||||
"<tr class=\"altColor\" id=\"i0\">\n"
|
||||
+ "<td class=\"colFirst\"><code><a href=\"ObjectProperty.html\" "
|
||||
+ "title=\"class in pkg\">ObjectProperty</a><<a href=\"MyObj.html\" "
|
||||
+ "title=\"class in pkg\">MyObj</a>[]></code></td>\n"
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 4904075 4774450 5015144 8043698 8196201
|
||||
* @bug 4904075 4774450 5015144 8043698 8196201 8203791
|
||||
* @summary Reference unnamed package as "Unnamed", not empty string.
|
||||
* Generate a package summary for the unnamed package.
|
||||
* @author jamieh
|
||||
@ -71,12 +71,14 @@ public class TestUnnamedPackage extends JavadocTester {
|
||||
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
|
||||
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
|
||||
+ "</tr>\n"
|
||||
+ "<tr id=\"i0\" class=\"altColor\">\n"
|
||||
+ "<tbody>\n"
|
||||
+ "<tr class=\"altColor\" id=\"i0\">\n"
|
||||
+ "<td class=\"colFirst\"><a href=\"C.html\" title=\"class in <Unnamed>\">C</a></td>\n"
|
||||
+ "<th class=\"colLast\" scope=\"row\">\n"
|
||||
+ "<div class=\"block\">This is a class in the unnamed package.</div>\n"
|
||||
+ "</th>\n"
|
||||
+ "</tr>\n"
|
||||
+ "</tbody>\n"
|
||||
+ "</table>");
|
||||
|
||||
checkOutput("allpackages-index.html", true,
|
||||
|
Loading…
x
Reference in New Issue
Block a user