changeset 3939:1fee6f0b43ba

8172528: problem generating JavaFX docs Reviewed-by: ksrini Contributed-by: jonathan.gibbons@oracle.com
author bpatel
date Wed, 01 Feb 2017 20:14:52 -0800
parents fed0944bb38a
children dc59890c8a7e
files src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
diffstat 2 files changed, 98 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java	Wed Feb 01 19:48:36 2017 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java	Wed Feb 01 20:14:52 2017 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,6 +74,11 @@
         return memberTree;
     }
 
+    @Override
+    public boolean showTabs() {
+        return false;
+    }
+
     /**
      * {@inheritDoc}
      */
--- a/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java	Wed Feb 01 19:48:36 2017 -0800
+++ b/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java	Wed Feb 01 20:14:52 2017 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363 8167967
+ * @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363 8167967 8172528
  * @summary Test of the JavaFX doclet features.
  * @author jvalenta
  * @library ../lib
@@ -50,93 +50,103 @@
 
         checkOutput("pkg1/C.html", true,
                 "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
-                    + "<dd><a href=\"../pkg1/C.html#getRate--\"><code>getRate()</code></a>, \n"
-                    + "<a href=\"../pkg1/C.html#setRate-double-\">"
-                    + "<code>setRate(double)</code></a></dd>",
+                + "<dd><a href=\"../pkg1/C.html#getRate--\"><code>getRate()</code></a>, \n"
+                + "<a href=\"../pkg1/C.html#setRate-double-\">"
+                + "<code>setRate(double)</code></a></dd>",
                 "<pre>public final&nbsp;void&nbsp;setRate(double&nbsp;value)</pre>\n"
-                    + "<div class=\"block\">Sets the value of the property rate.</div>\n"
-                    + "<dl>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
+                + "<div class=\"block\">Sets the value of the property rate.</div>\n"
+                + "<dl>\n"
+                + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
                 "<pre>public final&nbsp;double&nbsp;getRate()</pre>\n"
-                    + "<div class=\"block\">Gets the value of the property rate.</div>\n"
-                    + "<dl>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
+                + "<div class=\"block\">Gets the value of the property rate.</div>\n"
+                + "<dl>\n"
+                + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
                 "<td class=\"colFirst\"><code><a href=\"../pkg1/C.DoubleProperty.html\" "
-                    + "title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n"
-                    + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
-                    + "<a href=\"../pkg1/C.html#rateProperty\">rate</a></span></code></th>\n"
-                    + "<td class=\"colLast\">\n"
-                    + "<div class=\"block\">Defines the direction/speed at which the "
-                    + "<code>Timeline</code> is expected to\n"
-                    + " be played.</div>\n</td>",
+                + "title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n"
+                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<a href=\"../pkg1/C.html#rateProperty\">rate</a></span></code></th>\n"
+                + "<td class=\"colLast\">\n"
+                + "<div class=\"block\">Defines the direction/speed at which the "
+                + "<code>Timeline</code> is expected to\n"
+                + " be played.</div>\n</td>",
                 "<span class=\"simpleTagLabel\">Default value:</span>",
                 "<span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                    + "<dd>JavaFX 8.0</dd>",
+                + "<dd>JavaFX 8.0</dd>",
                 "<p>Sets the value of the property <code>Property</code>",
                 "<p>Gets the value of the property <code>Property</code>",
                 "<span class=\"simpleTagLabel\">Property description:</span>",
                 "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
-                    + "<a href=\"../pkg1/C.html#setTestMethodProperty--\">"
-                    + "setTestMethodProperty</a></span>()</code></th>",
+                + "<a href=\"../pkg1/C.html#setTestMethodProperty--\">"
+                + "setTestMethodProperty</a></span>()</code></th>",
                 "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
-                    + "<a href=\"../pkg1/C.html#pausedProperty\">paused</a></span></code></th>\n"
-                    + "<td class=\"colLast\">\n"
-                    + "<div class=\"block\">Defines if paused.</div>",
+                + "<a href=\"../pkg1/C.html#pausedProperty\">paused</a></span></code></th>\n"
+                + "<td class=\"colLast\">\n"
+                + "<div class=\"block\">Defines if paused.</div>",
                 "<h4>paused</h4>\n"
-                    + "<pre>public final&nbsp;<a href=\"../pkg1/C.BooleanProperty.html\" "
-                    + "title=\"class in pkg1\">C.BooleanProperty</a> pausedProperty</pre>\n"
-                    + "<div class=\"block\">Defines if paused. The second line.</div>",
+                + "<pre>public final&nbsp;<a href=\"../pkg1/C.BooleanProperty.html\" "
+                + "title=\"class in pkg1\">C.BooleanProperty</a> pausedProperty</pre>\n"
+                + "<div class=\"block\">Defines if paused. The second line.</div>",
                 "<h4>isPaused</h4>\n"
-                    + "<pre>public final&nbsp;double&nbsp;isPaused()</pre>\n"
-                    + "<div class=\"block\">Gets the value of the property paused.</div>",
+                + "<pre>public final&nbsp;double&nbsp;isPaused()</pre>\n"
+                + "<div class=\"block\">Gets the value of the property paused.</div>",
                 "<h4>setPaused</h4>\n"
-                    + "<pre>public final&nbsp;void&nbsp;setPaused(boolean&nbsp;value)</pre>\n"
-                    + "<div class=\"block\">Sets the value of the property paused.</div>\n"
-                    + "<dl>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
-                    + "<dd>Defines if paused. The second line.</dd>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
-                    + "<dd>false</dd>",
+                + "<pre>public final&nbsp;void&nbsp;setPaused(boolean&nbsp;value)</pre>\n"
+                + "<div class=\"block\">Sets the value of the property paused.</div>\n"
+                + "<dl>\n"
+                + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
+                + "<dd>Defines if paused. The second line.</dd>\n"
+                + "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
+                + "<dd>false</dd>",
                 "<h4>isPaused</h4>\n"
-                    + "<pre>public final&nbsp;double&nbsp;isPaused()</pre>\n"
-                    + "<div class=\"block\">Gets the value of the property paused.</div>\n"
-                    + "<dl>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
-                    + "<dd>Defines if paused. The second line.</dd>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
-                    + "<dd>false</dd>",
+                + "<pre>public final&nbsp;double&nbsp;isPaused()</pre>\n"
+                + "<div class=\"block\">Gets the value of the property paused.</div>\n"
+                + "<dl>\n"
+                + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
+                + "<dd>Defines if paused. The second line.</dd>\n"
+                + "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
+                + "<dd>false</dd>",
                 "<h4>rate</h4>\n"
-                    + "<pre>public final&nbsp;<a href=\"../pkg1/C.DoubleProperty.html\" "
-                    + "title=\"class in pkg1\">C.DoubleProperty</a> rateProperty</pre>\n"
-                    + "<div class=\"block\">Defines the direction/speed at which the "
-                    + "<code>Timeline</code> is expected to\n"
-                    + " be played. This is the second line.</div>",
+                + "<pre>public final&nbsp;<a href=\"../pkg1/C.DoubleProperty.html\" "
+                + "title=\"class in pkg1\">C.DoubleProperty</a> rateProperty</pre>\n"
+                + "<div class=\"block\">Defines the direction/speed at which the "
+                + "<code>Timeline</code> is expected to\n"
+                + " be played. This is the second line.</div>",
                 "<h4>setRate</h4>\n"
-                    + "<pre>public final&nbsp;void&nbsp;setRate(double&nbsp;value)</pre>\n"
-                    + "<div class=\"block\">Sets the value of the property rate.</div>\n"
-                    + "<dl>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
-                    + "<dd>Defines the direction/speed at which the <code>Timeline</code> is expected to\n"
-                    + " be played. This is the second line.</dd>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
-                    + "<dd>11</dd>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                    + "<dd>JavaFX 8.0</dd>",
+                + "<pre>public final&nbsp;void&nbsp;setRate(double&nbsp;value)</pre>\n"
+                + "<div class=\"block\">Sets the value of the property rate.</div>\n"
+                + "<dl>\n"
+                + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
+                + "<dd>Defines the direction/speed at which the <code>Timeline</code> is expected to\n"
+                + " be played. This is the second line.</dd>\n"
+                + "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
+                + "<dd>11</dd>\n"
+                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
+                + "<dd>JavaFX 8.0</dd>",
                 "<h4>getRate</h4>\n"
-                    + "<pre>public final&nbsp;double&nbsp;getRate()</pre>\n"
-                    + "<div class=\"block\">Gets the value of the property rate.</div>\n"
-                    + "<dl>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
-                    + "<dd>Defines the direction/speed at which the <code>Timeline</code> is expected to\n"
-                    + " be played. This is the second line.</dd>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
-                    + "<dd>11</dd>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                    + "<dd>JavaFX 8.0</dd>",
+                + "<pre>public final&nbsp;double&nbsp;getRate()</pre>\n"
+                + "<div class=\"block\">Gets the value of the property rate.</div>\n"
+                + "<dl>\n"
+                + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
+                + "<dd>Defines the direction/speed at which the <code>Timeline</code> is expected to\n"
+                + " be played. This is the second line.</dd>\n"
+                + "<dt><span class=\"simpleTagLabel\">Default value:</span></dt>\n"
+                + "<dd>11</dd>\n"
+                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
+                + "<dd>JavaFX 8.0</dd>",
+                "<h3>Property Summary</h3>\n"
+                + "<table class=\"memberSummary\" summary=\"Property Summary table, listing properties, and an explanation\">\n"
+                + "<caption><span>Properties</span><span class=\"tabEnd\">&nbsp;</span></caption>",
                 "");
 
         checkOutput("pkg1/C.html", false,
-                "A()");
+                "A()",
+                "<h3>Property Summary</h3>\n"
+                + "<table class=\"memberSummary\" summary=\"Property Summary table, listing properties, and an explanation\">\n"
+                + "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Methods</span><span class=\"tabEnd\">&nbsp;</span>"
+                + "</span><span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">Instance Methods</a>"
+                + "</span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t4\" class=\"tableTab\"><span>"
+                + "<a href=\"javascript:show(8);\">Concrete Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
+                + "</caption>");
 
         checkOutput("index-all.html", true,
                 "<div class=\"block\">Gets the value of the property paused.</div>",
@@ -193,7 +203,19 @@
                 + "</li>\n"
                 + "</ul>\n"
                 + "</li>\n"
-                + "</ul>");
+                + "</ul>",
+                "<h3>Property Summary</h3>\n"
+                + "<table class=\"memberSummary\" summary=\"Property Summary table, listing properties, and an explanation\">\n"
+                + "<caption><span>Properties</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+
+        checkOutput("pkg2/Test.html", false,
+                "<h3>Property Summary</h3>\n"
+                + "<table class=\"memberSummary\" summary=\"Property Summary table, listing properties, and an explanation\">\n"
+                + "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Methods</span><span class=\"tabEnd\">&nbsp;</span>"
+                + "</span><span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">Instance Methods</a>"
+                + "</span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t4\" class=\"tableTab\"><span>"
+                + "<a href=\"javascript:show(8);\">Concrete Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
+                + "</caption>");
     }
 
     /*