changeset 942:59e272db3bc6

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/2.2/scrum/graphics/jfx/rt
author Martin Sladecek <martin.sladecek@oracle.com>
date Wed, 02 May 2012 10:17:46 +0200
parents 3fa9344823cf 5e7b9296733b
children ea84eaa07624
files javafx-ui-common/src/javafx/scene/Scene.java
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/javafx/scene/Scene.java	Tue May 01 10:04:19 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/Scene.java	Wed May 02 10:17:46 2012 +0200
@@ -180,6 +180,7 @@
      *
      * @throws IllegalStateException if this constructor is called on a thread
      * other than the JavaFX Application Thread.
+     * @throws NullPointerException if root is null
      */
     public Scene(Parent root) {
         this(root, -1, -1, Color.WHITE, false);
@@ -210,6 +211,7 @@
      *
      * @throws IllegalStateException if this constructor is called on a thread
      * other than the JavaFX Application Thread.
+     * @throws NullPointerException if root is null
      */
     public Scene(Parent root, double width, double height) {
         this(root, width, height, Color.WHITE, false);
@@ -223,6 +225,7 @@
      *
      * @throws IllegalStateException if this constructor is called on a thread
      * other than the JavaFX Application Thread.
+     * @throws NullPointerException if root is null
      */
     public Scene(Parent root, @Default("javafx.scene.paint.Color.WHITE") Paint fill) {
         this(root, -1, -1, fill, false);
@@ -238,6 +241,7 @@
      *
      * @throws IllegalStateException if this constructor is called on a thread
      * other than the JavaFX Application Thread.
+     * @throws NullPointerException if root is null
      */
     public Scene(Parent root, double width, double height,
             @Default("javafx.scene.paint.Color.WHITE") Paint fill) {
@@ -260,6 +264,7 @@
      *
      * @throws IllegalStateException if this constructor is called on a thread
      * other than the JavaFX Application Thread.
+     * @throws NullPointerException if root is null
      *
      * @see javafx.scene.Node#setDepthTest(DepthTest)
      */
@@ -917,6 +922,9 @@
      * layout of the scene graph.    If a resizable node (layout {@code Region} or
      * {@code Control}) is set as the root, then the root's size will track the
      * scene's size, causing the contents to be relayed out as necessary.
+     * 
+     * Scene doesn't accept null root.
+     * 
      */
     private ObjectProperty<Parent> root;