Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Thu Jun 27 16:06:56 2013 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Thu Jun 27 17:47:18 2013 +0200
     1.3 @@ -385,15 +385,21 @@
     1.4          }
     1.5          commentTextBuilder.append(propertyDoc.commentText());
     1.6  
     1.7 -        Tag[] tags = propertyDoc.tags("@defaultValue");
     1.8 -        if (tags != null) {
     1.9 -            for (Tag tag: tags) {
    1.10 -                commentTextBuilder.append("\n")
    1.11 -                                  .append(tag.name())
    1.12 -                                  .append(" ")
    1.13 -                                  .append(tag.text());
    1.14 +        // copy certain tags
    1.15 +        List<Tag> allTags = new LinkedList<Tag>();
    1.16 +        String[] tagNames = {"@defaultValue", "@since"};
    1.17 +        for (String tagName: tagNames) {
    1.18 +            Tag[] tags = propertyDoc.tags(tagName);
    1.19 +            if (tags != null) {
    1.20 +                allTags.addAll(Arrays.asList(tags));
    1.21              }
    1.22          }
    1.23 +        for (Tag tag: allTags) {
    1.24 +            commentTextBuilder.append("\n")
    1.25 +                                .append(tag.name())
    1.26 +                                .append(" ")
    1.27 +                                .append(tag.text());
    1.28 +        }
    1.29  
    1.30          //add @see tags
    1.31          if (!isGetter && !isSetter) {

     2.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java	Thu Jun 27 16:06:56 2013 +0100
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java	Thu Jun 27 17:47:18 2013 +0200
     2.3 @@ -631,6 +631,10 @@
     2.4       * Initialize standard Javadoc tags for ordering purposes.
     2.5       */
     2.6      private void initStandardTaglets() {
     2.7 +        if (javafx) {
     2.8 +            initJavaFXTaglets();
     2.9 +        }
    2.10 +
    2.11          Taglet temp;
    2.12          addStandardTaglet(new ParamTaglet());
    2.13          addStandardTaglet(new ReturnTaglet());
    2.14 @@ -664,10 +668,6 @@
    2.15          standardTags.add("serial");
    2.16          standardTags.add("serialField");
    2.17          standardTags.add("Text");
    2.18 -
    2.19 -        if (javafx) {
    2.20 -            initJavaFXTaglets();
    2.21 -        }
    2.22      }
    2.23  
    2.24      /**

     3.1 --- a/test/com/sun/javadoc/testJavaFX/C.java	Thu Jun 27 16:06:56 2013 +0100
     3.2 +++ b/test/com/sun/javadoc/testJavaFX/C.java	Thu Jun 27 17:47:18 2013 +0200
     3.3 @@ -57,6 +57,7 @@
     3.4       * Defines the direction/speed at which the {@code Timeline} is expected to
     3.5       * be played.
     3.6       * @defaultValue 11
     3.7 +     * @since JavaFX 8.0
     3.8       */
     3.9      private DoubleProperty rate;
    3.10  

     4.1 --- a/test/com/sun/javadoc/testJavaFX/TestJavaFX.java	Thu Jun 27 16:06:56 2013 +0100
     4.2 +++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java	Thu Jun 27 17:47:18 2013 +0200
     4.3 @@ -55,6 +55,8 @@
     4.4              {"./" + BUG_ID + "/C.html",
     4.5                  "<span class=\"strong\">Default value:</span>"},
     4.6              {"./" + BUG_ID + "/C.html",
     4.7 +                "<span class=\"strong\">Since:</span></dt>" + NL + "<dd>JavaFX 8.0</dd>" },
     4.8 +            {"./" + BUG_ID + "/C.html",
     4.9                  "<p>Sets the value of the property <code>Property</code>"},
    4.10              {"./" + BUG_ID + "/C.html",
    4.11                  "<p>Gets the value of the property <code>Property</code>"},
    4.12 @@ -78,7 +80,7 @@
    4.13  
    4.14  
    4.15      private static final String[] ARGS = new String[] {
    4.16 -        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-private", "-javafx",
    4.17 +        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-javafx",
    4.18          SRC_DIR + FS + "C.java", SRC_DIR + FS + "D.java"
    4.19      };
    4.20