Mercurial > hg > openjdk > aarch64-port > langtools
changeset 1869:26437287529d
8015720: since tag isn't copied while generating JavaFX documentation
Reviewed-by: jjg
| author | janvalenta |
|---|---|
| date | Thu, 27 Jun 2013 17:47:18 +0200 |
| parents | d137ce373c4c |
| children | 065f8cb7bd89 |
| files | src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java test/com/sun/javadoc/testJavaFX/C.java test/com/sun/javadoc/testJavaFX/TestJavaFX.java |
| diffstat | 4 files changed, 21 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Thu Jun 27 16:06:56 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Thu Jun 27 17:47:18 2013 +0200 @@ -385,15 +385,21 @@ } commentTextBuilder.append(propertyDoc.commentText()); - Tag[] tags = propertyDoc.tags("@defaultValue"); - if (tags != null) { - for (Tag tag: tags) { - commentTextBuilder.append("\n") - .append(tag.name()) - .append(" ") - .append(tag.text()); + // 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) { + allTags.addAll(Arrays.asList(tags)); } } + for (Tag tag: allTags) { + commentTextBuilder.append("\n") + .append(tag.name()) + .append(" ") + .append(tag.text()); + } //add @see tags if (!isGetter && !isSetter) {
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Thu Jun 27 16:06:56 2013 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Thu Jun 27 17:47:18 2013 +0200 @@ -631,6 +631,10 @@ * Initialize standard Javadoc tags for ordering purposes. */ private void initStandardTaglets() { + if (javafx) { + initJavaFXTaglets(); + } + Taglet temp; addStandardTaglet(new ParamTaglet()); addStandardTaglet(new ReturnTaglet()); @@ -664,10 +668,6 @@ standardTags.add("serial"); standardTags.add("serialField"); standardTags.add("Text"); - - if (javafx) { - initJavaFXTaglets(); - } } /**
--- a/test/com/sun/javadoc/testJavaFX/C.java Thu Jun 27 16:06:56 2013 +0100 +++ b/test/com/sun/javadoc/testJavaFX/C.java Thu Jun 27 17:47:18 2013 +0200 @@ -57,6 +57,7 @@ * Defines the direction/speed at which the {@code Timeline} is expected to * be played. * @defaultValue 11 + * @since JavaFX 8.0 */ private DoubleProperty rate;
--- a/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Thu Jun 27 16:06:56 2013 +0100 +++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Thu Jun 27 17:47:18 2013 +0200 @@ -55,6 +55,8 @@ {"./" + BUG_ID + "/C.html", "<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", "<p>Sets the value of the property <code>Property</code>"}, {"./" + BUG_ID + "/C.html", "<p>Gets the value of the property <code>Property</code>"}, @@ -78,7 +80,7 @@ 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" };