# HG changeset patch # User bpatel # Date 1486008892 28800 # Node ID 1162c044cf2672e648b2e1208e66b236e574152f # Parent 786800fd7cf04c4a345f876030fdf6315cf2291b 8172528: problem generating JavaFX docs Reviewed-by: ksrini Contributed-by: jonathan.gibbons@oracle.com diff -r 786800fd7cf0 -r 1162c044cf26 langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java Wed Feb 01 19:48:36 2017 -0800 +++ b/langtools/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} */ diff -r 786800fd7cf0 -r 1162c044cf26 langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java --- a/langtools/test/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Wed Feb 01 19:48:36 2017 -0800 +++ b/langtools/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, "
See Also:
\n" - + "
getRate(), \n" - + "" - + "setRate(double)
", + + "
getRate(), \n" + + "" + + "setRate(double)
", "
public final void setRate(double value)
\n" - + "
Sets the value of the property rate.
\n" - + "
\n" - + "
Property description:
", + + "
Sets the value of the property rate.
\n" + + "
\n" + + "
Property description:
", "
public final double getRate()
\n" - + "
Gets the value of the property rate.
\n" - + "
\n" - + "
Property description:
", + + "
Gets the value of the property rate.
\n" + + "
\n" + + "
Property description:
", "C.DoubleProperty\n" - + "" - + "rate\n" - + "\n" - + "
Defines the direction/speed at which the " - + "Timeline is expected to\n" - + " be played.
\n", + + "title=\"class in pkg1\">C.DoubleProperty\n" + + "" + + "rate\n" + + "\n" + + "
Defines the direction/speed at which the " + + "Timeline is expected to\n" + + " be played.
\n", "Default value:", "Since:\n" - + "
JavaFX 8.0
", + + "
JavaFX 8.0
", "

Sets the value of the property Property", "

Gets the value of the property Property", "Property description:", "" - + "" - + "setTestMethodProperty()", + + "" + + "setTestMethodProperty()", "" - + "paused\n" - + "\n" - + "

Defines if paused.
", + + "paused\n" + + "\n" + + "
Defines if paused.
", "

paused

\n" - + "
public final C.BooleanProperty pausedProperty
\n" - + "
Defines if paused. The second line.
", + + "
public final C.BooleanProperty pausedProperty
\n" + + "
Defines if paused. The second line.
", "

isPaused

\n" - + "
public final double isPaused()
\n" - + "
Gets the value of the property paused.
", + + "
public final double isPaused()
\n" + + "
Gets the value of the property paused.
", "

setPaused

\n" - + "
public final void setPaused(boolean value)
\n" - + "
Sets the value of the property paused.
\n" - + "
\n" - + "
Property description:
\n" - + "
Defines if paused. The second line.
\n" - + "
Default value:
\n" - + "
false
", + + "
public final void setPaused(boolean value)
\n" + + "
Sets the value of the property paused.
\n" + + "
\n" + + "
Property description:
\n" + + "
Defines if paused. The second line.
\n" + + "
Default value:
\n" + + "
false
", "

isPaused

\n" - + "
public final double isPaused()
\n" - + "
Gets the value of the property paused.
\n" - + "
\n" - + "
Property description:
\n" - + "
Defines if paused. The second line.
\n" - + "
Default value:
\n" - + "
false
", + + "
public final double isPaused()
\n" + + "
Gets the value of the property paused.
\n" + + "
\n" + + "
Property description:
\n" + + "
Defines if paused. The second line.
\n" + + "
Default value:
\n" + + "
false
", "

rate

\n" - + "
public final C.DoubleProperty rateProperty
\n" - + "
Defines the direction/speed at which the " - + "Timeline is expected to\n" - + " be played. This is the second line.
", + + "
public final C.DoubleProperty rateProperty
\n" + + "
Defines the direction/speed at which the " + + "Timeline is expected to\n" + + " be played. This is the second line.
", "

setRate

\n" - + "
public final void setRate(double value)
\n" - + "
Sets the value of the property rate.
\n" - + "
\n" - + "
Property description:
\n" - + "
Defines the direction/speed at which the Timeline is expected to\n" - + " be played. This is the second line.
\n" - + "
Default value:
\n" - + "
11
\n" - + "
Since:
\n" - + "
JavaFX 8.0
", + + "
public final void setRate(double value)
\n" + + "
Sets the value of the property rate.
\n" + + "
\n" + + "
Property description:
\n" + + "
Defines the direction/speed at which the Timeline is expected to\n" + + " be played. This is the second line.
\n" + + "
Default value:
\n" + + "
11
\n" + + "
Since:
\n" + + "
JavaFX 8.0
", "

getRate

\n" - + "
public final double getRate()
\n" - + "
Gets the value of the property rate.
\n" - + "
\n" - + "
Property description:
\n" - + "
Defines the direction/speed at which the Timeline is expected to\n" - + " be played. This is the second line.
\n" - + "
Default value:
\n" - + "
11
\n" - + "
Since:
\n" - + "
JavaFX 8.0
", + + "
public final double getRate()
\n" + + "
Gets the value of the property rate.
\n" + + "
\n" + + "
Property description:
\n" + + "
Defines the direction/speed at which the Timeline is expected to\n" + + " be played. This is the second line.
\n" + + "
Default value:
\n" + + "
11
\n" + + "
Since:
\n" + + "
JavaFX 8.0
", + "

Property Summary

\n" + + "\n" + + "", ""); checkOutput("pkg1/C.html", false, - "A()"); + "A()", + "

Property Summary

\n" + + "
Properties 
\n" + + ""); checkOutput("index-all.html", true, "
Gets the value of the property paused.
", @@ -193,7 +203,19 @@ + "\n" + "\n" + "\n" - + ""); + + "", + "

Property Summary

\n" + + "
All Methods " + + "Instance Methods" + + " " + + "Concrete Methods " + + "
\n" + + ""); + + checkOutput("pkg2/Test.html", false, + "

Property Summary

\n" + + "
Properties 
\n" + + ""); } /*
All Methods " + + "Instance Methods" + + " " + + "Concrete Methods " + + "