提交 1e629ff5 编写于 作者: J janvalenta

8015720: since tag isn't copied while generating JavaFX documentation

Reviewed-by: jjg
上级 8e223585
...@@ -385,15 +385,21 @@ public class MemberSummaryBuilder extends AbstractMemberBuilder { ...@@ -385,15 +385,21 @@ public class MemberSummaryBuilder extends AbstractMemberBuilder {
} }
commentTextBuilder.append(propertyDoc.commentText()); commentTextBuilder.append(propertyDoc.commentText());
Tag[] tags = propertyDoc.tags("@defaultValue"); // copy certain tags
if (tags != null) { List<Tag> allTags = new LinkedList<Tag>();
for (Tag tag: tags) { String[] tagNames = {"@defaultValue", "@since"};
commentTextBuilder.append("\n") for (String tagName: tagNames) {
.append(tag.name()) Tag[] tags = propertyDoc.tags(tagName);
.append(" ") if (tags != null) {
.append(tag.text()); allTags.addAll(Arrays.asList(tags));
} }
} }
for (Tag tag: allTags) {
commentTextBuilder.append("\n")
.append(tag.name())
.append(" ")
.append(tag.text());
}
//add @see tags //add @see tags
if (!isGetter && !isSetter) { if (!isGetter && !isSetter) {
......
...@@ -631,6 +631,10 @@ public class TagletManager { ...@@ -631,6 +631,10 @@ public class TagletManager {
* Initialize standard Javadoc tags for ordering purposes. * Initialize standard Javadoc tags for ordering purposes.
*/ */
private void initStandardTaglets() { private void initStandardTaglets() {
if (javafx) {
initJavaFXTaglets();
}
Taglet temp; Taglet temp;
addStandardTaglet(new ParamTaglet()); addStandardTaglet(new ParamTaglet());
addStandardTaglet(new ReturnTaglet()); addStandardTaglet(new ReturnTaglet());
...@@ -664,10 +668,6 @@ public class TagletManager { ...@@ -664,10 +668,6 @@ public class TagletManager {
standardTags.add("serial"); standardTags.add("serial");
standardTags.add("serialField"); standardTags.add("serialField");
standardTags.add("Text"); standardTags.add("Text");
if (javafx) {
initJavaFXTaglets();
}
} }
/** /**
......
...@@ -57,6 +57,7 @@ public class C { ...@@ -57,6 +57,7 @@ public class C {
* Defines the direction/speed at which the {@code Timeline} is expected to * Defines the direction/speed at which the {@code Timeline} is expected to
* be played. * be played.
* @defaultValue 11 * @defaultValue 11
* @since JavaFX 8.0
*/ */
private DoubleProperty rate; private DoubleProperty rate;
......
...@@ -54,6 +54,8 @@ public class TestJavaFX extends JavadocTester { ...@@ -54,6 +54,8 @@ public class TestJavaFX extends JavadocTester {
{"./" + BUG_ID + "/C.html", {"./" + BUG_ID + "/C.html",
"<span class=\"strong\">Default value:</span>"}, "<span class=\"strong\">Default value:</span>"},
{"./" + BUG_ID + "/C.html",
"<span class=\"strong\">Since:</span></dt>" + NL + "<dd>JavaFX 8.0</dd>" },
{"./" + BUG_ID + "/C.html", {"./" + BUG_ID + "/C.html",
"<p>Sets the value of the property <code>Property</code>"}, "<p>Sets the value of the property <code>Property</code>"},
{"./" + BUG_ID + "/C.html", {"./" + BUG_ID + "/C.html",
...@@ -78,7 +80,7 @@ public class TestJavaFX extends JavadocTester { ...@@ -78,7 +80,7 @@ public class TestJavaFX extends JavadocTester {
private static final String[] ARGS = new String[] { private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-private", "-javafx", "-d", BUG_ID, "-sourcepath", SRC_DIR, "-javafx",
SRC_DIR + FS + "C.java", SRC_DIR + FS + "D.java" SRC_DIR + FS + "C.java", SRC_DIR + FS + "D.java"
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册