archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-16 17:14:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Reviewed-by: jjg
This commit is contained in:
Jan Valenta 2013-06-27 17:47:18 +02:00
parent a87b5d942d
commit 97f7bab3c7
4 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
View file

@ -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
List<Tag> allTags = new LinkedList<Tag>();
String[] tagNames = {"@defaultValue", "@since"};
for (String tagName: tagNames) {
Tag[] tags = propertyDoc.tags(tagName);
if (tags != null) { if (tags != null) {
for (Tag tag: tags) { allTags.addAll(Arrays.asList(tags));
}
}
for (Tag tag: allTags) {
commentTextBuilder.append("\n") commentTextBuilder.append("\n")
.append(tag.name()) .append(tag.name())
.append(" ") .append(" ")
.append(tag.text()); .append(tag.text());
} }
}
//add @see tags //add @see tags
if (!isGetter && !isSetter) { if (!isGetter && !isSetter) {

8
langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
View file

@ -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 {
standardTags.add("serial"); standardTags.add("serial");
standardTags.add("serialField"); standardTags.add("serialField");
standardTags.add("Text"); standardTags.add("Text");
if (javafx) {
initJavaFXTaglets();
}
} }
/** /**

1
langtools/test/com/sun/javadoc/testJavaFX/C.java
View file

@ -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;

4
langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java
View file

@ -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 {
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"
}; };