changeset 3818:a1348a50b9ef

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8.0/scrum/controls/jfx/rt
author David Grieve<david.grieve@oracle.com>
date Wed, 29 May 2013 16:37:39 -0400
parents 02aaa6e6a7e0 eeaaed36a3d8
children e0145393ceaa a92e5afc944b 0e8bd17417d3
files javafx-builders/test/unit/com/sun/javafx/test/PropertiesTestBase.java javafx-builders/test/unit/com/sun/javafx/test/PropertyReference.java javafx-builders/test/unit/com/sun/javafx/test/binding/ReflectionHelper.java javafx-builders/test/unit/javafx/scene/Node_properties_Test.java javafx-builders/test/unit/javafx/scene/Scene_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/Blend_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/Bloom_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/BoxBlur_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/ColorAdjust_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/ColorInput_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/DisplacementMap_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/DistantLight_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/DropShadow_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/FloatMap_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/GaussianBlur_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/Glow_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/ImageInput_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/InnerShadow_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/Lighting_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/MotionBlur_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/PerspectiveTransform_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/PointLight_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/Reflection_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/SepiaTone_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/Shadow_properties_Test.java javafx-builders/test/unit/javafx/scene/effect/SpotLight_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/ArcTo_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/Arc_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/Circle_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/CubicCurveTo_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/CubicCurve_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/Ellipse_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/HLineTo_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/LineTo_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/Line_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/MoveTo_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/Path_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/QuadCurveTo_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/QuadCurve_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/Rectangle_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/SVGPath_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/Shape_properties_Test.java javafx-builders/test/unit/javafx/scene/shape/VLineTo_properties_Test.java javafx-builders/test/unit/javafx/scene/transform/Transform_properties_Test.java
diffstat 51 files changed, 175 insertions(+), 4301 deletions(-) [+]
line wrap: on
line diff
--- a/apps/experiments/3DViewer/3D Viewer.iml	Wed May 29 10:09:54 2013 -0700
+++ b/apps/experiments/3DViewer/3D Viewer.iml	Wed May 29 16:37:39 2013 -0400
@@ -58,7 +58,9 @@
     <orderEntry type="module" module-name="prism-sw" />
     <orderEntry type="module" module-name="prism-util" />
     <orderEntry type="module" module-name="test-stub-toolkit" />
-    <orderEntry type="module" module-name="webkit" />
+    <orderEntry type="module" module-name="webview" />
+    <orderEntry type="module" module-name="javafx-builders" />
+    <orderEntry type="module" module-name="javafx-font-t2k" />
   </component>
 </module>
 
--- a/apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SimpleViewerApp.java	Wed May 29 10:09:54 2013 -0700
+++ b/apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SimpleViewerApp.java	Wed May 29 16:37:39 2013 -0400
@@ -67,7 +67,7 @@
 
     @Override public void start(Stage stage) throws Exception {
         List<String> args = getParameters().getRaw();
-        Scene scene = new Scene(root3D,1920,1080,true,false);
+        final Scene scene = new Scene(root3D,1920,1080,true,false);
         scene.setFill(Color.ALICEBLUE);
 
         // CAMERA
--- a/apps/experiments/Modena/Modena.iml	Wed May 29 10:09:54 2013 -0700
+++ b/apps/experiments/Modena/Modena.iml	Wed May 29 16:37:39 2013 -0400
@@ -53,9 +53,12 @@
     <orderEntry type="module" module-name="prism-ps" />
     <orderEntry type="module" module-name="prism-util" />
     <orderEntry type="module" module-name="test-stub-toolkit" />
-    <orderEntry type="module" module-name="webkit" />
+    <orderEntry type="module" module-name="webview" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="library" name="webkit-impl" level="project" />
+    <orderEntry type="module" module-name="javafx-builders" />
+    <orderEntry type="module" module-name="javafx-font-t2k" />
+    <orderEntry type="module" module-name="prism-sw" />
   </component>
 </module>
 
--- a/apps/experiments/Modena/src/modena/SamplePage.java	Wed May 29 10:09:54 2013 -0700
+++ b/apps/experiments/Modena/src/modena/SamplePage.java	Wed May 29 16:37:39 2013 -0400
@@ -79,7 +79,7 @@
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TooltipBuilder;
-import javafx.scene.control.TreeTableViewBuilder;
+import javafx.scene.control.TreeTableView;
 import javafx.scene.control.TreeViewBuilder;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
@@ -88,13 +88,13 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.layout.VBoxBuilder;
 import javafx.scene.paint.Color;
-import javafx.scene.web.HTMLEditorBuilder;
+import javafx.scene.web.HTMLEditor;
 
 import static modena.SamplePageChartHelper.*;
 import static modena.SamplePageHelpers.*;
 import static modena.SamplePageTableHelper.*;
-import static modena.SamplePageTreeHelper.*;
-import static modena.SamplePageTreeTableHelper.*;
+import static modena.SamplePageTreeHelper.createTreeView;
+import static modena.SamplePageTreeTableHelper.createTreeTableView;
 
 /**
  * Page showing every control in every state.
@@ -302,32 +302,32 @@
         choiceBoxLongList.add(100, "Long List");
         newSection(
                 "ChoiceBox:",
-                ChoiceBoxBuilder.create(String.class).items(sampleItems()).value("Item A").build(),
-                ChoiceBoxBuilder.create(String.class).items(choiceBoxLongList).value("Long List").build(),
-                withState(ChoiceBoxBuilder.create(String.class).items(sampleItems()).value("Item B").build(), "hover"),
-                withState(ChoiceBoxBuilder.create(String.class).items(sampleItems()).value("Item B").build(), "showing"),
-                withState(ChoiceBoxBuilder.create(String.class).items(sampleItems()).value("Item B").build(), "focused"),
-                ChoiceBoxBuilder.create(String.class).items(sampleItems()).value("Item C").disable(true).build()
+                ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item A").build(),
+                ChoiceBoxBuilder.<String>create().items(choiceBoxLongList).value("Long List").build(),
+                withState(ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "hover"),
+                withState(ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "showing"),
+                withState(ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "focused"),
+                ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item C").disable(true).build()
         );
         newSection(
                 "ComboBox:",
-                ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item A").build(),
-                ComboBoxBuilder.create(String.class).items(choiceBoxLongList).value("Long List").build(),
-                withState(ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item B").build(), "hover"),
-                withState(ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item B").build(), "showing"),
-                withState(ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item B").build(), "focused"),
-                ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item C").disable(true).build()
+                ComboBoxBuilder.<String>create().items(sampleItems()).value("Item A").build(),
+                ComboBoxBuilder.<String>create().items(choiceBoxLongList).value("Long List").build(),
+                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "hover"),
+                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "showing"),
+                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "focused"),
+                ComboBoxBuilder.<String>create().items(sampleItems()).value("Item C").disable(true).build()
                 );
         newSection(
                 "ComboBox\nEditable:",
-                ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item A").editable(true).build(),
-                withState(ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item B").editable(true).build(), "editable", ".arrow-button", "hover"),
-                withState(ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item B").editable(true).build(), "editable", ".arrow-button", "pressed")
+                ComboBoxBuilder.<String>create().items(sampleItems()).value("Item A").editable(true).build(),
+                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").editable(true).build(), "editable", ".arrow-button", "hover"),
+                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").editable(true).build(), "editable", ".arrow-button", "pressed")
                 );
         newSection(
                 "ComboBox\nEditable\n(More):",
-                withState(ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item B").editable(true).build(), "editable,contains-focus", ".text-field", "focused"),
-                ComboBoxBuilder.create(String.class).items(sampleItems()).value("Item C").editable(true).disable(true).build()
+                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").editable(true).build(), "editable,contains-focus", ".text-field", "focused"),
+                ComboBoxBuilder.<String>create().items(sampleItems()).value("Item C").editable(true).disable(true).build()
                 );
         newSection(
                 "Color Picker:",
@@ -465,11 +465,16 @@
         );
         newSection(
                 "HTMLEditor:",
-                HTMLEditorBuilder.create().htmlText("Hello <b>Bold</b> Text").prefWidth(650).prefHeight(120).build()
-                );
+                new HTMLEditor() {{
+                    setHtmlText("Hello <b>Bold</b> Text");
+                    setPrefSize(650, 120);
+                }});
         newSection(
                 "HTMLEditor\nFocused:",
-                withState(HTMLEditorBuilder.create().htmlText("<i>Focused</i>").prefWidth(650).prefHeight(120).build(), "focused")
+                withState(new HTMLEditor() {{
+                    setHtmlText("<i>Focused</i>");
+                    setPrefSize(650, 120);
+                }}, "focused")
                 );
         newDetailedSection(
                 new String[] { "ToolBar (H|TOP):", "normal", "overflow", "disabled" },
@@ -640,10 +645,12 @@
                 );
         newDetailedSection(
                 new String[] {"Empty:", "ListView", "TableView", "TreeView", "TreeTableView"},
-                ListViewBuilder.create(String.class).prefWidth(150).prefHeight(100).build(),
-                TableViewBuilder.create(Object.class).prefWidth(150).prefHeight(100).build(),
-                TreeViewBuilder.create(Object.class).prefWidth(150).prefHeight(100).build(),
-                TreeTableViewBuilder.create(Object.class).prefWidth(150).prefHeight(100).build()
+                ListViewBuilder.<String>create().prefWidth(150).prefHeight(100).build(),
+                TableViewBuilder.create().prefWidth(150).prefHeight(100).build(),
+                TreeViewBuilder.create().prefWidth(150).prefHeight(100).build(),
+                new TreeTableView() {{
+                    setPrefSize(150, 100);
+                }}
                 );
         newDetailedSection(
                 new String[] {"ToolTip:","inline","inline + graphic", "popup"},
--- a/apps/samples/Ensemble8/Ensemble8.iml	Wed May 29 10:09:54 2013 -0700
+++ b/apps/samples/Ensemble8/Ensemble8.iml	Wed May 29 16:37:39 2013 -0400
@@ -58,8 +58,11 @@
     <orderEntry type="module" module-name="prism-ps" />
     <orderEntry type="module" module-name="prism-util" />
     <orderEntry type="module" module-name="test-stub-toolkit" />
-    <orderEntry type="module" module-name="webkit" />
+    <orderEntry type="module" module-name="webview" />
     <orderEntry type="library" name="webkit-impl" level="project" />
+    <orderEntry type="module" module-name="javafx-builders" />
+    <orderEntry type="module" module-name="javafx-font-t2k" />
+    <orderEntry type="module" module-name="prism-sw" />
   </component>
 </module>
 
--- a/javafx-builders/test/unit/com/sun/javafx/test/BuilderProxy.java	Wed May 29 10:09:54 2013 -0700
+++ b/javafx-builders/test/unit/com/sun/javafx/test/BuilderProxy.java	Wed May 29 16:37:39 2013 -0400
@@ -25,8 +25,8 @@
 
 package com.sun.javafx.test;
 
+import java.lang.reflect.Method;
 import com.sun.javafx.test.binding.ReflectionHelper;
-import java.lang.reflect.Method;
 
 public final class BuilderProxy {
     private final Class<?> builderClass;
@@ -48,9 +48,9 @@
     public PropertyReference createPropertyReference(
             final String propertyName,
             final Class<?> propertyValueType) {
-        return PropertyReference.createForBuilder(builderClass,
-                                                  propertyName,
-                                                  propertyValueType);
+        return createForBuilder(builderClass,
+                                propertyName,
+                                propertyValueType);
     }
 
     public void applyTo(final Object builder, final Object bean) {
@@ -75,4 +75,27 @@
                                                       "applyTo",
                                                       beanClass));
     }
+
+    public static PropertyReference createForBuilder(
+            final Class<?> builderClass,
+            final String propertyName,
+            final Class<?> propertyValueType) {
+        try {
+            final Method propertySetterMethod =
+                    ReflectionHelper.getMethod(
+                            builderClass,
+                            propertyName,
+                            propertyValueType);
+
+            return new PropertyReference(
+                               propertyName,
+                               propertyValueType,
+                               null,
+                               propertySetterMethod);
+        } catch (final RuntimeException e) {
+            throw new RuntimeException("Failed to obtain setter for "
+                                           + propertyName + "!");
+        }
+    }
+
 }
--- a/javafx-builders/test/unit/com/sun/javafx/test/PropertiesTestBase.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,344 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.javafx.test;
-
-import javafx.beans.property.ReadOnlyProperty;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.value.ObservableValue;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public abstract class PropertiesTestBase {
-
-    private final Configuration configuration;
-
-    public PropertiesTestBase(final Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    @Test
-    public void testBuilder() {
-        configuration.builderTest();
-    }
-
-    /**
-     * Single bean, single property configuration.
-     */
-    public static Object[] config(final Object bean,
-                                  final String propertyName,
-                                  final Object propertyValue1,
-                                  final Object propertyValue2) {
-        return config(new Configuration(bean,
-                                        propertyName,
-                                        propertyValue1,
-                                        propertyValue2));
-    }
-
-    /**
-     * Single bean, single property configuration with custom value comparator.
-     */
-    public static Object[] config(final Object bean,
-                                  final String propertyName,
-                                  final Object propertyValue1,
-                                  final Object propertyValue2,
-                                  final ValueComparator comparator) {
-        return config(new Configuration(bean,
-                                        propertyName,
-                                        propertyValue1,
-                                        propertyValue2,
-                                        comparator));
-    }
-
-    /**
-     * Single bean, propertyA (source) and propertyB (dependent) property
-     * configuration.
-     */
-    public static Object[] config(final Object beanA,
-                                  final String propertyAName,
-                                  final Object propertyAValue1,
-                                  final Object propertyAValue2,
-                                  final String propertyBName,
-                                  final Object propertyBValue1,
-                                  final Object propertyBValue2) {
-        return config(new Configuration(beanA,
-                                        propertyAName,
-                                        propertyAValue1,
-                                        propertyAValue2,
-                                        propertyBName,
-                                        propertyBValue1,
-                                        propertyBValue2));
-    }
-
-    /**
-     * BeanA with propertyA (source) and BeanB with propertyB (dependent)
-     * configuration.
-     */
-    public static Object[] config(final Object beanA,
-                                  final String propertyAName,
-                                  final Object propertyAValue1,
-                                  final Object propertyAValue2,
-                                  final Object beanB,
-                                  final String propertyBName,
-                                  final Object propertyBValue1,
-                                  final Object propertyBValue2) {
-        return config(new Configuration(beanA,
-                                        propertyAName,
-                                        propertyAValue1,
-                                        propertyAValue2,
-                                        beanB,
-                                        propertyBName,
-                                        propertyBValue1,
-                                        propertyBValue2));
-    }
-
-    /**
-     * BeanA with propertyA (source) and BeanB with propertyB (dependent)
-     * with custom value comparator configuration.
-     */
-    public static Object[] config(final Object beanA,
-                                  final String propertyAName,
-                                  final Object propertyAValue1,
-                                  final Object propertyAValue2,
-                                  final Object beanB,
-                                  final String propertyBName,
-                                  final Object propertyBValue1,
-                                  final Object propertyBValue2,
-                                  final ValueComparator propertyBComparator) {
-        return config(new Configuration(beanA,
-                                        propertyAName,
-                                        propertyAValue1,
-                                        propertyAValue2,
-                                        beanB,
-                                        propertyBName,
-                                        propertyBValue1,
-                                        propertyBValue2,
-                                        propertyBComparator));
-    }
-
-    public static Object[] config(final Configuration configuration) {
-        return new Object[] { configuration };
-    }
-
-    public static class Configuration {
-        private final Object beanA;
-
-        private final PropertyReference propertyAReference;
-
-        private final Object propertyAValue1;
-
-        private final Object propertyAValue2;
-
-        private final Object beanB;
-
-        private final PropertyReference propertyBReference;
-
-        private final Object propertyBValue1;
-
-        private final Object propertyBValue2;
-
-        private final ValueComparator propertyBComparator;
-
-        private boolean allowMultipleNotifications;
-
-        public Configuration(final Object bean,
-                             final String propertyName,
-                             final Object propertyValue1,
-                             final Object propertyValue2) {
-            this(bean, propertyName, propertyValue1, propertyValue2,
-                 bean, propertyName, propertyValue1, propertyValue2,
-                 ValueComparator.DEFAULT);
-        }
-
-        public Configuration(final Object bean,
-                             final String propertyName,
-                             final Object propertyValue1,
-                             final Object propertyValue2,
-                             final ValueComparator valueComparator) {
-            this(bean, propertyName, propertyValue1, propertyValue2,
-                 bean, propertyName, propertyValue1, propertyValue2,
-                 valueComparator);
-        }
-
-        public Configuration(final Object bean,
-                             final String propertyAName,
-                             final Object propertyAValue1,
-                             final Object propertyAValue2,
-                             final String propertyBName,
-                             final Object propertyBValue1,
-                             final Object propertyBValue2) {
-            this(bean, propertyAName, propertyAValue1, propertyAValue2,
-                 bean, propertyBName, propertyBValue1, propertyBValue2,
-                 ValueComparator.DEFAULT);
-        }
-
-        public Configuration(final Object beanA,
-                             final String propertyAName,
-                             final Object propertyAValue1,
-                             final Object propertyAValue2,
-                             final Object beanB,
-                             final String propertyBName,
-                             final Object propertyBValue1,
-                             final Object propertyBValue2) {
-            this(beanA, propertyAName, propertyAValue1, propertyAValue2,
-                 beanB, propertyBName, propertyBValue1, propertyBValue2,
-                 ValueComparator.DEFAULT);
-        }
-        
-        public Configuration(final Object beanA,
-                             final String propertyAName,
-                             final Object propertyAValue1,
-                             final Object propertyAValue2,
-                             final Object beanB,
-                             final String propertyBName,
-                             final Object propertyBValue1,
-                             final Object propertyBValue2,
-                             final ValueComparator propertyBComparator) {
-            this.beanA = beanA;
-            this.propertyAReference = PropertyReference.createForBean(
-                                              beanA.getClass(),
-                                              propertyAName);
-            this.propertyAValue1 = propertyAValue1;
-            this.propertyAValue2 = propertyAValue2;
-            this.beanB = beanB;
-            this.propertyBReference = PropertyReference.createForBean(
-                                              beanB.getClass(),
-                                              propertyBName);
-            this.propertyBValue1 = propertyBValue1;
-            this.propertyBValue2 = propertyBValue2;
-            this.propertyBComparator = propertyBComparator;
-        }
-
-        public void setAllowMultipleNotifications(
-                final boolean allowMultipleNotifications) {
-            this.allowMultipleNotifications = allowMultipleNotifications;
-        }
-
-        public void builderTest() {
-            final BuilderProxy builderProxy =
-                    BuilderProxy.createForBean(beanA.getClass());
-
-            if (builderProxy == null) {
-                // no builder, no test
-                return;
-            }
-
-            final Object builder = builderProxy.createBuilder();
-            final PropertyReference builderPropRefA =
-                    builderProxy.createPropertyReference(
-                            propertyAReference.getPropertyName(),
-                            propertyAReference.getValueType());
-
-            // set to first value and verify dependet value
-            builderPropRefA.setValue(builder, propertyAValue1);
-            builderProxy.applyTo(builder, beanA);
-            propertyBComparator.assertEquals(
-                    propertyBValue1,
-                    propertyBReference.getValue(beanB));
-
-            final ValueInvalidationListener valueInvalidationListener =
-                    new ValueInvalidationListener(allowMultipleNotifications);
-            final ObservableValue observableValueB =
-                    (ObservableValue) BindingHelper.getPropertyModel(
-                                                  beanB, propertyBReference);
-
-            // register listener
-            observableValueB.addListener(valueInvalidationListener);
-
-            // set to second value
-            builderPropRefA.setValue(builder, propertyAValue2);
-            builderProxy.applyTo(builder, beanA);
-
-            // verify that the listener has been called
-            valueInvalidationListener.assertCalled();
-            valueInvalidationListener.reset();
-
-            // test whether the second dependent value is set
-            propertyBComparator.assertEquals(
-                    propertyBValue2,
-                    propertyBReference.getValue(beanB));
-
-            // set to the second value again
-            builderProxy.applyTo(builder, beanA);
-
-            // verify that the listener has not been called
-            valueInvalidationListener.assertNotCalled();
-
-            // unregister listener
-            observableValueB.removeListener(valueInvalidationListener);
-
-            // set to the first value again and test
-            builderPropRefA.setValue(builder, propertyAValue1);
-            builderProxy.applyTo(builder, beanA);
-            propertyBComparator.assertEquals(
-                    propertyBValue1,
-                    propertyBReference.getValue(beanB));
-
-            // verify that the listener has not been called
-            valueInvalidationListener.assertNotCalled();
-        }
-    }
-
-    private static final class ValueInvalidationListener
-            implements InvalidationListener {
-        private final boolean allowMultipleNotifications;
-
-        private int counter;
-
-        public ValueInvalidationListener(
-                final boolean allowMultipleNotifications) {
-            this.allowMultipleNotifications = allowMultipleNotifications;
-        }
-
-        public void reset() {
-            counter = 0;
-        }
-
-        public void assertCalled() {
-            if (counter == 0) {
-                Assert.fail("Listener has not been called!");
-                return;
-            }
-
-            if (!allowMultipleNotifications && (counter > 1)) {
-                Assert.fail("Listener called multiple times!");
-            }
-        }
-
-        public void assertNotCalled() {
-            if (counter != 0) {
-                Assert.fail("Listener has been called!");
-                return;
-            }
-        }
-
-        @Override
-        public void invalidated(final Observable valueModel) {
-            ++counter;
-        }
-    }
-}
--- a/javafx-builders/test/unit/com/sun/javafx/test/PropertyReference.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.javafx.test;
-
-import java.lang.reflect.Method;
-
-import com.sun.javafx.test.binding.ReflectionHelper;
-
-public final class PropertyReference {
-    private final String propertyName;
-    private final Class<?> valueType;
-    private final Method getterMethod;
-    private final Method setterMethod;
-
-    public PropertyReference(final String propertyName,
-                             final Class<?> valueType,
-                             final Method getterMethod,
-                             final Method setterMethod) {
-        this.propertyName = propertyName;
-        this.valueType = valueType;
-        this.getterMethod = getterMethod;
-        this.setterMethod = setterMethod;
-    }
-
-    public String getPropertyName() {
-        return propertyName;
-    }
-
-    public Class<?> getValueType() {
-        return valueType;
-    }
-
-    public Object getValue(final Object object) {
-        if (getterMethod == null) {
-            throw new RuntimeException("No getter associated with "
-                                           + propertyName + "!");
-        }
-
-        return ReflectionHelper.invokeMethod(object, getterMethod);
-    }
-
-    public void setValue(final Object object, final Object value) {
-        if (setterMethod == null) {
-            throw new RuntimeException("No setter associated with "
-                                           + propertyName + "!");
-        }
-
-        ReflectionHelper.invokeMethod(object, setterMethod, value);
-    }
-
-    public static PropertyReference createForBean(final Class<?> beanClass,
-                                                  final String propertyName) {
-        final String capitalizedPropertyName = capitalizeName(propertyName);
-
-        Method propertyGetterMethod;
-        try {
-            propertyGetterMethod = ReflectionHelper.getMethod(
-                                           beanClass,
-                                           "get" + capitalizedPropertyName);
-        } catch (final RuntimeException eget) {
-            // second try with is
-            try {
-                propertyGetterMethod = ReflectionHelper.getMethod(
-                                               beanClass,
-                                               "is" + capitalizedPropertyName);
-            } catch (final RuntimeException eis) {
-                throw new RuntimeException("Failed to obtain getter for "
-                                               + propertyName + "!");
-            }
-        }
-
-        final Class<?> propertyValueType = propertyGetterMethod.getReturnType();
-
-        Method propertySetterMethod;
-        try {
-            propertySetterMethod = ReflectionHelper.getMethod(
-                                           beanClass,
-                                           "set" + capitalizedPropertyName,
-                                           propertyValueType);
-        } catch (final RuntimeException e) {
-            // no setter
-            propertySetterMethod = null;
-        }
-
-        return new PropertyReference(
-                           propertyName,
-                           propertyValueType,
-                           propertyGetterMethod,
-                           propertySetterMethod);
-    }
-
-    public static PropertyReference createForBuilder(
-            final Class<?> builderClass,
-            final String propertyName,
-            final Class<?> propertyValueType) {
-        try {
-            final Method propertySetterMethod =
-                    ReflectionHelper.getMethod(
-                            builderClass,
-                            propertyName,
-                            propertyValueType);
-
-            return new PropertyReference(
-                               propertyName,
-                               propertyValueType,
-                               null,
-                               propertySetterMethod);
-        } catch (final RuntimeException e) {
-            throw new RuntimeException("Failed to obtain setter for "
-                                           + propertyName + "!");
-        }
-    }
-
-    private static String capitalizeName(final String input) {
-        return !input.isEmpty() 
-                ? Character.toUpperCase(input.charAt(0)) + input.substring(1)
-                : input;
-    }
-}
--- a/javafx-builders/test/unit/com/sun/javafx/test/binding/ReflectionHelper.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.javafx.test.binding;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public final class ReflectionHelper {
-    private ReflectionHelper() {
-    }
-
-    public static Class<?> classForName(final String className) {
-        try {
-            return Class.forName(className);
-        } catch (final ClassNotFoundException e) {
-            throw convertToRuntimeException(e);
-        }
-    }
-
-    public static Object newInstance(final Class<?> cls) {
-        try {
-            return cls.newInstance();
-        } catch (final InstantiationException e) {
-            throw convertToRuntimeException(e);
-        } catch (final IllegalAccessException e) {
-            throw convertToRuntimeException(e);
-        }
-    }
-
-    public static Method getMethod(final Class<?> cls,
-                                   final String methodName,
-                                   final Class<?>... parameterTypes) {
-        try {
-            return cls.getMethod(methodName, parameterTypes);
-        } catch (final NoSuchMethodException e) {
-            throw convertToRuntimeException(e);
-        } catch (final SecurityException e) {
-            throw convertToRuntimeException(e);
-        }
-    }
-
-    public static Object invokeMethod(final Object object,
-                                      final Method method,
-                                      final Object... args) {
-        try {
-            return method.invoke(object, args);
-        } catch (final IllegalAccessException e) {
-            throw convertToRuntimeException(e);
-        } catch (final IllegalArgumentException e) {
-            throw convertToRuntimeException(e);
-        } catch (final InvocationTargetException e) {
-            throw convertToRuntimeException(e);
-        }
-    }
-
-    private static RuntimeException convertToRuntimeException(
-            final Exception e) {
-        return new RuntimeException(e);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/Node_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import javafx.event.Event;
-import javafx.event.EventHandler;
-import javafx.geometry.Point2D;
-import javafx.scene.effect.BlendMode;
-import javafx.scene.effect.Glow;
-import javafx.scene.input.InputMethodRequests;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.transform.Rotate;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.event.EventHandlerManager;
-import com.sun.javafx.test.PropertiesTestBase;
-import javafx.geometry.NodeOrientation;
-
-@RunWith(Parameterized.class)
-public final class Node_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Group testParent = new Group();
-        final Node testNode = new Rectangle();
-        testParent.getChildren().add(testNode);
-        
-        final EventHandler testEventHandler =
-                new EventHandler<Event>() {
-                    @Override
-                    public void handle(Event event) {
-                    }
-                };
-
-        return Arrays.asList(new Object[] {
-//            config(testNode, "parent", , ),
-//            config(testNode, "scene", , ),
-            config(testNode, "id", "rect_1", "rect_2"),
-            config(testNode, "style", "style_1", "style_2"),
-            config(testNode, "visible", true, false),
-            config(testNode, "cursor", Cursor.DEFAULT, Cursor.CROSSHAIR),
-            config(testNode, "opacity", 1.0, 0.5),
-            config(testNode, "blendMode",
-                   BlendMode.SRC_OVER, BlendMode.SRC_ATOP),
-            config(testNode, "clip", null, new Rectangle(0, 0, 100, 100)),
-            config(testNode, "cache", false, true),
-            config(testNode, "cacheHint", CacheHint.QUALITY, CacheHint.SPEED),
-            config(testNode, "effect", null, new Glow()),
-            config(testNode, "depthTest", DepthTest.DISABLE, DepthTest.ENABLE),
-            config(testNode, "disable", false, true),
-            config(testNode, "pickOnBounds", false, true),
-            config(testParent, "disable", false, true,
-                   testNode, "disabled", false, true),
-            config(testNode, "onDragEntered", null, testEventHandler),
-            config(testNode, "onDragExited", null, testEventHandler),
-            config(testNode, "onDragOver", null, testEventHandler),
-            config(testNode, "onDragDropped", null, testEventHandler),
-            config(testNode, "onDragDone", null, testEventHandler),
-            config(testNode, "managed", false, true),
-            config(testNode, "layoutX", 0.0, 100.0),
-            config(testNode, "layoutY", 0.0, 100.0),
-//            config(testNode, "boundsInParent", , ),
-//            config(testNode, "boundsInLocal", , ),
-//            config(testNode, "layoutBounds", , ),
-//            config(testNode, "transforms", , ),
-            config(testNode, "translateX", 0.0, 100.0),
-            config(testNode, "translateY", 0.0, 100.0),
-            config(testNode, "translateZ", 0.0, 100.0),
-            config(testNode, "scaleX", 1.0, 0.5),
-            config(testNode, "scaleY", 1.0, 0.5),
-            config(testNode, "scaleZ", 1.0, 0.5),
-            config(testNode, "rotate", 0.0, 45.0),
-            config(testNode, "rotationAxis", Rotate.Z_AXIS, Rotate.X_AXIS),
-            config(testNode, "mouseTransparent", false, true),
-//            config(testNode, "hover", , ),
-//            config(testNode, "pressed", , ),
-            config(testNode, "onMouseClicked", null, testEventHandler),
-            config(testNode, "onMouseDragged", null, testEventHandler),
-            config(testNode, "onMouseEntered", null, testEventHandler),
-            config(testNode, "onMouseExited", null, testEventHandler),
-            config(testNode, "onMouseMoved", null, testEventHandler),
-            config(testNode, "onMousePressed", null, testEventHandler),
-            config(testNode, "onMouseReleased", null, testEventHandler),
-            config(testNode, "onDragDetected", null, testEventHandler),
-            config(testNode, "onKeyPressed", null, testEventHandler),
-            config(testNode, "onKeyReleased", null, testEventHandler),
-            config(testNode, "onKeyTyped", null, testEventHandler),
-            config(testNode, "onInputMethodTextChanged",
-                   null, testEventHandler),
-            config(testNode, "inputMethodRequests",
-                   null,
-                   new InputMethodRequests() {
-                       @Override
-                       public Point2D getTextLocation(final int offset) {
-                           return new Point2D(0, 0);
-                       }
-
-                       @Override
-                       public int getLocationOffset(final int x, final int y) {
-                           return 0;
-                       }
-
-                       @Override
-                       public void cancelLatestCommittedText() {
-                       }
-
-                       @Override
-                       public String getSelectedText() {
-                           return "";
-                       }
-                   }),
-//            config(testNode, "focused", , ),
-            config(testNode, "focusTraversable", false, true),
-//            config(testNode, "treeVisible", , ),
-            config(testNode, "eventDispatcher", 
-                   null,
-                   new EventHandlerManager(null)),
-            config(testNode,
-                   "nodeOrientation", NodeOrientation.INHERIT,
-                                      NodeOrientation.RIGHT_TO_LEFT,
-                   "effectiveNodeOrientation", NodeOrientation.LEFT_TO_RIGHT,
-                                               NodeOrientation.RIGHT_TO_LEFT),
-            config(testParent, "nodeOrientation",
-                       NodeOrientation.LEFT_TO_RIGHT,
-                       NodeOrientation.RIGHT_TO_LEFT,
-                   testNode, "effectiveNodeOrientation",
-                       NodeOrientation.LEFT_TO_RIGHT,
-                       NodeOrientation.RIGHT_TO_LEFT)
-        });
-    }
-
-    public Node_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/Scene_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene;
-
-import com.sun.javafx.cursor.CursorFrame;
-import com.sun.javafx.event.EventHandlerManager;
-import java.util.Arrays;
-import java.util.Collection;
-import javafx.event.Event;
-import javafx.event.EventHandler;
-import javafx.geometry.NodeOrientation;
-import javafx.scene.paint.Color;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-import com.sun.javafx.test.objects.TestScene;
-import com.sun.javafx.test.objects.TestStage;
-import javafx.scene.layout.Pane;
-
-@RunWith(Parameterized.class)
-public final class Scene_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final TestScene testScene = new TestScene(new Group());
-
-        final TestStage testStage1 = new TestStage("STAGE_1");
-        final TestStage testStage2 = new TestStage("STAGE_2");
-        
-        final EventHandler testEventHandler =
-                new EventHandler<Event>() {
-                    @Override
-                    public void handle(Event event) {
-                    }
-                };
-        
-        return Arrays.asList(new Object[] {
-            config(testScene,
-                   "_window", testStage1, testStage2,
-                   "window", testStage1, testStage2),
-//            config(testScene, "x", , ),
-//            config(testScene, "y", , ),
-//            config(testScene, "width", , ),
-//            config(testScene, "height", , ),
-            config(testScene, "camera", null, new ParallelCamera()),
-            config(testScene, "fill", Color.WHITE, Color.BLACK),
-            config(testScene, "fill", null, Color.TRANSPARENT),
-            config(testScene, "root", new Group(), new Pane()),
-            config(testScene, "cursor", null, new Cursor("TestCursor") {
-                @Override public CursorFrame getCurrentFrame() {
-                    throw new UnsupportedOperationException("Not supported yet.");
-                }
-            }),
-            config(testScene, "cursor", Cursor.DEFAULT, Cursor.CROSSHAIR),
-            config(testScene, "eventDispatcher",
-                   null,
-                   new EventHandlerManager(null)),
-            config(testScene, "camera", null, new PerspectiveCamera()),
-            config(testScene, "onMouseClicked", null, testEventHandler),
-            config(testScene, "onMouseDragged", null, testEventHandler),
-            config(testScene, "onMouseEntered", null, testEventHandler),
-            config(testScene, "onMouseExited", null, testEventHandler),
-            config(testScene, "onMouseMoved", null, testEventHandler),
-            config(testScene, "onMousePressed", null, testEventHandler),
-            config(testScene, "onMouseReleased", null, testEventHandler),
-            config(testScene, "onDragDetected", null, testEventHandler),
-            config(testScene, "onDragEntered", null, testEventHandler),
-            config(testScene, "onDragExited", null, testEventHandler),
-            config(testScene, "onDragOver", null, testEventHandler),
-            config(testScene, "onDragDropped", null, testEventHandler),
-            config(testScene, "onDragDone", null, testEventHandler),
-            config(testScene, "onKeyPressed", null, testEventHandler),
-            config(testScene, "onKeyReleased", null, testEventHandler),
-            config(testScene, "onKeyTyped", null, testEventHandler),
-            config(testScene, "onContextMenuRequested", null, testEventHandler),
-            config(testScene, "onDragDetected", null, testEventHandler),
-            config(testScene, "onDragDone", null, testEventHandler),
-            config(testScene, "onDragDropped", null, testEventHandler),
-            config(testScene, "onDragEntered", null, testEventHandler),
-            config(testScene, "onDragExited", null, testEventHandler),
-            config(testScene, "onDragOver", null, testEventHandler),
-            config(testScene, "onMouseDragEntered", null, testEventHandler),
-            config(testScene, "onMouseDragExited", null, testEventHandler),
-            config(testScene, "onMouseDragOver", null, testEventHandler),
-            config(testScene, "onMouseDragReleased", null, testEventHandler),
-            config(testScene, "onRotate", null, testEventHandler),
-            config(testScene, "onRotationStarted", null, testEventHandler),
-            config(testScene, "onRotationFinished", null, testEventHandler),
-            config(testScene, "onZoom", null, testEventHandler),
-            config(testScene, "onZoomStarted", null, testEventHandler),
-            config(testScene, "onZoomFinished", null, testEventHandler),
-            config(testScene, "onScroll", null, testEventHandler),
-            config(testScene, "onScrollStarted", null, testEventHandler),
-            config(testScene, "onScrollFinished", null, testEventHandler),
-            config(testScene, "onSwipeLeft", null, testEventHandler),
-            config(testScene, "onSwipeRight", null, testEventHandler),
-            config(testScene, "onSwipeUp", null, testEventHandler),
-            config(testScene, "onSwipeDown", null, testEventHandler),
-            config(testScene, "onTouchPressed", null, testEventHandler),
-            config(testScene, "onTouchReleased", null, testEventHandler),
-            config(testScene, "onTouchMoved", null, testEventHandler),
-            config(testScene, "onTouchStationary", null, testEventHandler),
-            config(testScene, "onInputMethodTextChanged",
-                   null, testEventHandler),
-            config(testScene,
-                   "nodeOrientation", NodeOrientation.INHERIT,
-                                      NodeOrientation.RIGHT_TO_LEFT,
-                   "effectiveNodeOrientation", NodeOrientation.LEFT_TO_RIGHT,
-                                               NodeOrientation.RIGHT_TO_LEFT)
-        });
-    }
-
-    public Scene_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/Blend_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Blend_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Blend testBlend = new Blend();
-
-        return Arrays.asList(new Object[] {
-            config(testBlend, "mode", BlendMode.SRC_OVER, BlendMode.SRC_ATOP),
-            config(testBlend, "opacity", 1.0, 0.5),
-            config(testBlend, "bottomInput", null, new BoxBlur()),
-            config(testBlend, "topInput", null, new BoxBlur())
-        });
-    }
-
-    public Blend_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/Bloom_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Bloom_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Bloom testBloom = new Bloom();
-
-        return Arrays.asList(new Object[] {
-            config(testBloom, "input", null, new BoxBlur()),
-            config(testBloom, "threshold", 0.3, 0.6)
-        });
-    }
-
-    public Bloom_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/BoxBlur_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class BoxBlur_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        final BoxBlur testBoxBlur = new BoxBlur();
-
-        array.add(config(testBoxBlur, "input", null, new BoxBlur()));
-        array.add(config(testBoxBlur, "width", 100.0, 200.0));
-        array.add(config(testBoxBlur, "height", 100.0, 200.0));
-        array.add(config(testBoxBlur, "iterations", 1, 3));
-
-        // bounding box calculation tests
-
-        // BoxBlur set directly on node
-        Node testNode = createTestNode();
-
-        array.add(config(testNode.getEffect(),
-                "iterations", 1, 2,
-                testNode,
-                "boundsInLocal",
-                box(-2.0, -2.0, 104.0, 104.0),
-                box(-4.0, -4.0, 108.0, 108.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "width", 5.0, 100.0,
-                testNode,
-                "boundsInLocal",
-                box(-2.0, -2.0, 104.0, 104.0),
-                box(-50.0, -2.0, 200.0, 104.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "height", 5.0, 100.0,
-                testNode,
-                "boundsInLocal",
-                box(-2.0, -2.0, 104.0, 104.0),
-                box(-2.0, -50.0, 104.0, 200.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-2.0, -2.0, 104.0, 104.0),
-                box(-4.0, -4.0, 108.0, 108.0),
-                new BBoxComparator(0.01)));
-
-        // BoxBlur chained to another effect
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "iterations", 1, 2,
-                testNode,
-                "boundsInLocal",
-                box(-2.0, -2.0, 104.0, 104.0),
-                box(-4.0, -4.0, 108.0, 108.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "width", 5.0, 100.0,
-                testNode,
-                "boundsInLocal",
-                box(-2.0, -2.0, 104.0, 104.0),
-                box(-50.0, -2.0, 200.0, 104.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "height", 5.0, 100.0,
-                testNode,
-                "boundsInLocal",
-                box(-2.0, -2.0, 104.0, 104.0),
-                box(-2.0, -50.0, 104.0, 200.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-2.0, -2.0, 104.0, 104.0),
-                box(-4.0, -4.0, 108.0, 108.0),
-                new BBoxComparator(0.01)));
-
-        return array;
-    }
-
-    public BoxBlur_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestNode() {
-        Rectangle r = new Rectangle(100, 100);
-        r.setEffect(new BoxBlur());
-        return r;
-    }
-
-    private static Rectangle createTestNodeWithChainedEffect() {
-        Rectangle r = new Rectangle(100, 100);
-        ColorAdjust ca = new ColorAdjust();
-        ca.setInput(new BoxBlur());
-        r.setEffect(ca);
-        return r;
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/ColorAdjust_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class ColorAdjust_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final ColorAdjust testColorAdjust = new ColorAdjust();
-
-        return Arrays.asList(new Object[] {
-            config(testColorAdjust, "input", null, new BoxBlur()),
-            config(testColorAdjust, "hue", 0.0, 0.5),
-            config(testColorAdjust, "saturation", 0.0, 0.5),
-            config(testColorAdjust, "brightness", 0.0, 0.5),
-            config(testColorAdjust, "contrast", 0.0, 0.5)
-        });
-    }
-
-    public ColorAdjust_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/ColorInput_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class ColorInput_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        final ColorInput testColorInput = new ColorInput();
-
-        array.add(config(testColorInput, "paint", Color.RED, Color.BLUE));
-        array.add(config(testColorInput, "x", 0.0, 100.0));
-        array.add(config(testColorInput, "y", 0.0, 100.0));
-        array.add(config(testColorInput, "width", 50.0, 150.0));
-        array.add(config(testColorInput, "height", 50.0, 150.0));
-
-        // bounding box calculation tests
-
-        Node testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "width", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 50.0),
-                box(0.0, 0.0, 50.0, 50.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "height", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 50.0, 0.0),
-                box(0.0, 0.0, 50.0, 50.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "x", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 50.0, 50.0),
-                box(50.0, 0.0, 50.0, 50.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "y", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 50.0, 50.0),
-                box(0.0, 50.0, 50.0, 50.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "width", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 50.0),
-                box(0.0, 0.0, 50.0, 50.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "height", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 50.0, 0.0),
-                box(0.0, 0.0, 50.0, 50.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "x", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 50.0, 50.0),
-                box(50.0, 0.0, 50.0, 50.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "y", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 50.0, 50.0),
-                box(0.0, 50.0, 50.0, 50.0),
-                new BBoxComparator(0.01)));
-
-        return array;
-    }
-
-    public ColorInput_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestNode() {
-        Rectangle r = new Rectangle(100, 100);
-        ColorInput flood = new ColorInput();
-        flood.setHeight(50);
-        flood.setWidth(50);
-        r.setEffect(flood);
-        return r;
-    }
-
-    private static Rectangle createTestNodeWithChainedEffect() {
-        Rectangle r = new Rectangle(100, 100);
-        ColorInput flood = new ColorInput();
-        flood.setHeight(50);
-        flood.setWidth(50);
-
-        ColorAdjust c = new ColorAdjust();
-        c.setInput(flood);
-        r.setEffect(c);
-        return r;
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/DisplacementMap_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class DisplacementMap_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final DisplacementMap testDisplacementMap = new DisplacementMap();
-
-        return Arrays.asList(new Object[] {
-            config(testDisplacementMap, "input", null, new BoxBlur()),
-            config(testDisplacementMap, "mapData", null, new FloatMap()),
-            config(testDisplacementMap, "scaleX", 1.0, 0.5),
-            config(testDisplacementMap, "scaleY", 1.0, 0.5),
-            config(testDisplacementMap, "offsetX", 0.0, 10.0),
-            config(testDisplacementMap, "offsetY", 0.0, 10.0),
-            config(testDisplacementMap, "wrap", false, true)
-        });
-    }
-
-    public DisplacementMap_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/DistantLight_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class DistantLight_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Light.Distant testDistantLight = new Light.Distant();
-
-        return Arrays.asList(new Object[] {
-            config(testDistantLight, "azimuth", 45.0, -135.0),
-            config(testDistantLight, "elevation", 45.0, 30.0)
-        });
-    }
-
-    public DistantLight_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/DropShadow_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class DropShadow_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        final DropShadow testDropShadow = new DropShadow();
-
-        array.add(config(testDropShadow, "input", null, new BoxBlur()));
-        array.add(config(testDropShadow, "radius", 50.0, 100.0));
-        array.add(config(testDropShadow, "width", 100.0, 200.0));
-        array.add(config(testDropShadow, "height", 100.0, 200.0));
-        array.add(config(testDropShadow, "blurType",
-                  BlurType.GAUSSIAN, BlurType.THREE_PASS_BOX));
-        array.add(config(testDropShadow, "spread", 0.0, 0.5));
-        array.add(config(testDropShadow, "color", Color.BLACK, Color.RED));
-        array.add(config(testDropShadow, "offsetX", 0.0, 50.0));
-        array.add(config(testDropShadow, "offsetY", 0.0, 50.0));
-
-        // bounding box calculation tests
-
-        Node testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "radius", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -9.0, 118.0, 118.0),
-                box(-20.0, -20.0, 140.0, 140.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "width", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-3.0, -9.0, 106.0, 118.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "height", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -3.0, 118.0, 106.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "offsetX", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, -9.0, 119.0, 118.0),
-                box(0.0, -9.0, 130.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "offsetY", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, 0.0, 118.0, 119.0),
-                box(-9.0, 0.0, 118.0, 130.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "blurType", BlurType.ONE_PASS_BOX, BlurType.THREE_PASS_BOX,
-                testNode,
-                "boundsInLocal",
-                box(-3.0, -3.0, 106.0, 106.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "blurType", BlurType.TWO_PASS_BOX, BlurType.GAUSSIAN,
-                testNode,
-                "boundsInLocal",
-                box(-6.0, -6.0, 112.0, 112.0),
-                box(-10.0, -10.0, 120.0, 120.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -9.0, 118.0, 118.0),
-                box(-11.0, -11.0, 122.0, 122.0),
-                new BBoxComparator(0.01)));
-
-        // DropShadow chained to another effect
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "radius", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -9.0, 118.0, 118.0),
-                box(-20.0, -20.0, 140.0, 140.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "width", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-3.0, -9.0, 106.0, 118.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "height", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -3.0, 118.0, 106.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "offsetX", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, -9.0, 119.0, 118.0),
-                box(0.0, -9.0, 130.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "offsetY", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, 0.0, 118.0, 119.0),
-                box(-9.0, 0.0, 118.0, 130.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "blurType", BlurType.ONE_PASS_BOX, BlurType.THREE_PASS_BOX,
-                testNode,
-                "boundsInLocal",
-                box(-3.0, -3.0, 106.0, 106.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "blurType", BlurType.TWO_PASS_BOX, BlurType.GAUSSIAN,
-                testNode,
-                "boundsInLocal",
-                box(-6.0, -6.0, 112.0, 112.0),
-                box(-10.0, -10.0, 120.0, 120.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -9.0, 118.0, 118.0),
-                box(-11.0, -11.0, 122.0, 122.0),
-                new BBoxComparator(0.01)));
-
-        return array;
-    }
-
-    public DropShadow_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestNode() {
-        Rectangle r = new Rectangle(100, 100);
-        r.setEffect(new DropShadow());
-        return r;
-    }
-
-    private static Rectangle createTestNodeWithChainedEffect() {
-        Rectangle r = new Rectangle(100, 100);
-        ColorAdjust c = new ColorAdjust();
-        c.setInput(new DropShadow());
-        r.setEffect(c);
-        return r;
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/FloatMap_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class FloatMap_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final FloatMap testFloatMap = new FloatMap();
-
-        return Arrays.asList(new Object[] {
-            config(testFloatMap, "width", 64, 128),
-            config(testFloatMap, "height", 64, 128)
-        });
-    }
-
-    public FloatMap_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/GaussianBlur_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class GaussianBlur_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        final GaussianBlur testGaussianBlur = new GaussianBlur();
-
-        array.add(config(testGaussianBlur, "input", null, new BoxBlur()));
-        array.add(config(testGaussianBlur, "radius", 20.0, 40.0));
-
-        // bounding box calculation tests
-
-        Node testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "radius", 0.0, 10.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 100.0),
-                box(-10.0, -10.0, 120.0, 120.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-10.0, -10.0, 120.0, 120.0),
-                box(-12.0, -12.0, 124.0, 124.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "radius", 0.0, 10.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 100.0),
-                box(-10.0, -10.0, 120.0, 120.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-10.0, -10.0, 120.0, 120.0),
-                box(-12.0, -12.0, 124.0, 124.0),
-                new BBoxComparator(0.01)));
-
-        return array;
-    }
-
-    public GaussianBlur_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestNode() {
-        Rectangle r = new Rectangle(100, 100);
-        r.setEffect(new GaussianBlur());
-        return r;
-    }
-
-    private static Rectangle createTestNodeWithChainedEffect() {
-        Rectangle r = new Rectangle(100, 100);
-        Glow g = new Glow();
-        g.setInput(new GaussianBlur());
-        r.setEffect(g);
-        return r;
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/Glow_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Glow_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Glow testGlow = new Glow();
-
-        return Arrays.asList(new Object[] {
-            config(testGlow, "input", null, new BoxBlur()),
-            config(testGlow, "level", 0.3, 0.6)
-        });
-    }
-
-    public Glow_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/ImageInput_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.image.TestImages;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class ImageInput_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        final ImageInput testImageInput = new ImageInput();
-
-        array.add(config(testImageInput, "source",
-                         null, TestImages.TEST_IMAGE_100x200));
-        array.add(config(testImageInput, "x", 0.0, 20.0));
-        array.add(config(testImageInput, "y", 0.0, 20.0));
-
-        // bounding box calculation tests
-
-        Node testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "source", TestImages.TEST_IMAGE_32x32, TestImages.TEST_IMAGE_64x64,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 32.0, 32.0),
-                box(0.0, 0.0, 64.0, 64.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        ((ImageInput) testNode.getEffect()).setSource(TestImages.TEST_IMAGE_32x32);
-        array.add(config(testNode.getEffect(),
-                "x", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 32.0, 32.0),
-                box(50.0, 0.0, 32.0, 32.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        ((ImageInput) testNode.getEffect()).setSource(TestImages.TEST_IMAGE_32x32);
-        array.add(config(testNode.getEffect(),
-                "y", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 32.0, 32.0),
-                box(0.0, 50.0, 32.0, 32.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "source", TestImages.TEST_IMAGE_32x32, TestImages.TEST_IMAGE_64x64,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 32.0, 32.0),
-                box(0.0, 0.0, 64.0, 64.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        ImageInput imageInput = (ImageInput)((ColorAdjust)testNode.getEffect()).getInput();
-        imageInput.setSource(TestImages.TEST_IMAGE_32x32);
-        array.add(config(imageInput,
-                "x", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 32.0, 32.0),
-                box(50.0, 0.0, 32.0, 32.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        imageInput = (ImageInput)((ColorAdjust)testNode.getEffect()).getInput();
-        imageInput.setSource(TestImages.TEST_IMAGE_32x32);
-        array.add(config(imageInput,
-                "y", 0.0, 50.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 32.0, 32.0),
-                box(0.0, 50.0, 32.0, 32.0),
-                new BBoxComparator(0.01)));
-
-        return array;
-    }
-
-    public ImageInput_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestNode() {
-        Rectangle r = new Rectangle(100, 100);
-        r.setEffect(new ImageInput());
-        return r;
-    }
-
-    private static Rectangle createTestNodeWithChainedEffect() {
-        Rectangle r = new Rectangle(100, 100);
-        ColorAdjust c = new ColorAdjust();
-        c.setInput(new ImageInput());
-        r.setEffect(c);
-        return r;
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/InnerShadow_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-import javafx.scene.paint.Color;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class InnerShadow_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final InnerShadow testInnerShadow = new InnerShadow();
-
-        return Arrays.asList(new Object[] {
-            config(testInnerShadow, "input", null, new BoxBlur()),
-            config(testInnerShadow, "radius", 20.0, 40.0),
-            config(testInnerShadow, "width", 100.0, 200.0),
-            config(testInnerShadow, "height", 100.0, 200.0),
-            config(testInnerShadow, "blurType",
-                   BlurType.GAUSSIAN, BlurType.THREE_PASS_BOX),
-            config(testInnerShadow, "choke", 0.0, 0.5),
-            config(testInnerShadow, "color", Color.BLACK, Color.RED),
-            config(testInnerShadow, "offsetX", 0.0, 50.0),
-            config(testInnerShadow, "offsetY", 0.0, 50.0)
-        });
-    }
-
-    public InnerShadow_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/Lighting_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Lighting_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Lighting testLighting = new Lighting();
-
-        return Arrays.asList(new Object[] {
-            config(testLighting, "light", 
-                   new Light.Distant(),
-                   new Light.Point()),
-            config(testLighting, "bumpInput", null, new BoxBlur()),
-            config(testLighting, "contentInput", null, new BoxBlur()),
-            config(testLighting, "diffuseConstant", 1.0, 1.5),
-            config(testLighting, "specularConstant", 0.3, 0.6),
-            config(testLighting, "specularExponent", 20.0, 30.0),
-            config(testLighting, "surfaceScale", 1.5, 0.5)
-        });
-    }
-
-    public Lighting_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/MotionBlur_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class MotionBlur_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        final MotionBlur testMotionBlur = new MotionBlur();
-
-        array.add(config(testMotionBlur, "input", null, new BoxBlur()));
-        array.add(config(testMotionBlur, "radius", 20.0, 40.0));
-        array.add(config(testMotionBlur, "angle", 0.0, 45.0));
-
-        // bounding box calculation tests
-
-        Node testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "radius", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(-10.0, 0.0, 120.0, 100.0),
-                box(-20.0, 0.0, 140.0, 100.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "angle", 0.0, 45.0,
-                testNode,
-                "boundsInLocal",
-                box(-10.0, 0.0, 120.0, 100.0),
-                box(-8.0, -8.0, 116.0, 116.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-10.0, -0.0, 120.0, 100.0),
-                box(-12.0, -2.0, 124.0, 104.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "radius", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(-10.0, 0.0, 120.0, 100.0),
-                box(-20.0, 0.0, 140.0, 100.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "angle", 0.0, 45.0,
-                testNode,
-                "boundsInLocal",
-                box(-10.0, 0.0, 120.0, 100.0),
-                box(-8.0, -8.0, 116.0, 116.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-10.0, -0.0, 120.0, 100.0),
-                box(-12.0, -2.0, 124.0, 104.0),
-                new BBoxComparator(0.01)));
-
-        return array;
-    }
-
-    public MotionBlur_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestNode() {
-        Rectangle r = new Rectangle(100, 100);
-        r.setEffect(new MotionBlur());
-        return r;
-    }
-
-    private static Rectangle createTestNodeWithChainedEffect() {
-        Rectangle r = new Rectangle(100, 100);
-        ColorAdjust c = new ColorAdjust();
-        c.setInput(new MotionBlur());
-        r.setEffect(c);
-        return r;
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/PerspectiveTransform_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class PerspectiveTransform_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        final PerspectiveTransform testPerspectiveTransform =
-                new PerspectiveTransform();
-
-        array.add(config(testPerspectiveTransform, "input",
-                         null, new BoxBlur()));
-        array.add(config(testPerspectiveTransform, "ulx", 0.0, 10.0));
-        array.add(config(testPerspectiveTransform, "uly", 0.0, 10.0));
-        array.add(config(testPerspectiveTransform, "urx", 0.0, 310.0));
-        array.add(config(testPerspectiveTransform, "ury", 0.0, 40.0));
-        array.add(config(testPerspectiveTransform, "lrx", 0.0, 310.0));
-        array.add(config(testPerspectiveTransform, "lry", 0.0, 60.0));
-        array.add(config(testPerspectiveTransform, "llx", 0.0, 10.0));
-        array.add(config(testPerspectiveTransform, "lly", 0.0, 90.0));
-
-        // bounding box calculation tests
-
-        Node testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "llx", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 10.0, 0.0),
-                box(0.0, 0.0, 20.0, 0.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "lly", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 10.0),
-                box(0.0, 0.0, 0.0, 20.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "lrx", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 10.0, 0.0),
-                box(0.0, 0.0, 20.0, 0.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "lry", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 10.0),
-                box(0.0, 0.0, 0.0, 20.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "ulx", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 10.0, 0.0),
-                box(0.0, 0.0, 20.0, 0.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "uly", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 10.0),
-                box(0.0, 0.0, 0.0, 20.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "urx", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 10.0, 0.0),
-                box(0.0, 0.0, 20.0, 0.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "ury", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 10.0),
-                box(0.0, 0.0, 0.0, 20.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        PerspectiveTransform pt = (PerspectiveTransform)testNode.getEffect();
-        pt.setLlx(0); pt.setLly(0);
-        pt.setLrx(100); pt.setLly(0);
-        pt.setUlx(0); pt.setUly(100);
-        pt.setUrx(100); pt.setUly(100);
-        array.add(config(testNode.getEffect(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 100.0),
-                box(0.0, 0.0, 100.0, 100.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "llx", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 10.0, 0.0),
-                box(0.0, 0.0, 20.0, 0.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "lly", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 10.0),
-                box(0.0, 0.0, 0.0, 20.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "lrx", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 10.0, 0.0),
-                box(0.0, 0.0, 20.0, 0.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "lry", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 10.0),
-                box(0.0, 0.0, 0.0, 20.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "ulx", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 10.0, 0.0),
-                box(0.0, 0.0, 20.0, 0.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "uly", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 10.0),
-                box(0.0, 0.0, 0.0, 20.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "urx", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 10.0, 0.0),
-                box(0.0, 0.0, 20.0, 0.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((ColorAdjust)testNode.getEffect()).getInput(),
-                "ury", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 0.0, 10.0),
-                box(0.0, 0.0, 0.0, 20.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        pt = (PerspectiveTransform)(((ColorAdjust)testNode.getEffect()).getInput());
-        pt.setLlx(0); pt.setLly(0);
-        pt.setLrx(100); pt.setLly(0);
-        pt.setUlx(0); pt.setUly(100);
-        pt.setUrx(100); pt.setUly(100);
-        array.add(config(pt,
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 100.0),
-                box(0.0, 0.0, 100.0, 100.0),
-                new BBoxComparator(0.01)));
-        return array;
-    }
-
-    public PerspectiveTransform_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestNode() {
-        Rectangle r = new Rectangle(100, 100);
-        r.setEffect(new PerspectiveTransform());
-        return r;
-    }
-
-
-    private static Rectangle createTestNodeWithChainedEffect() {
-        Rectangle r = new Rectangle(100, 100);
-        ColorAdjust c = new ColorAdjust();
-        c.setInput(new PerspectiveTransform());
-        r.setEffect(c);
-        return r;
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/PointLight_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class PointLight_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Light.Point testPointLight = new Light.Point();
-
-        return Arrays.asList(new Object[] {
-            config(testPointLight, "x", 0.0, -100.0),
-            config(testPointLight, "y", 0.0, -100.0),
-            config(testPointLight, "z", 0.0, 50.0)
-        });
-    }
-
-    public PointLight_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/Reflection_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Reflection_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        final Reflection testReflection = new Reflection();
-
-        array.add(config(testReflection, "input", null, new BoxBlur()));
-        array.add(config(testReflection, "topOffset", 0.0, 50.0));
-        array.add(config(testReflection, "topOpacity", 0.5, 0.0));
-        array.add(config(testReflection, "bottomOpacity", 1.0, 0.8));
-        array.add(config(testReflection, "fraction", 0.75, 0.5));
-
-        // bounding box calculation tests
-
-        Node testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "topOffset", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 185.0),
-                box(0.0, 0.0, 100.0, 195.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "fraction", 0.0, 1.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 100.0),
-                box(0.0, 0.0, 100.0, 200.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 175.0),
-                box(-2.0, -2.0, 104.0, 182.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "topOffset", 10.0, 20.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 185.0),
-                box(0.0, 0.0, 100.0, 195.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "fraction", 0.0, 1.0,
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 100.0),
-                box(0.0, 0.0, 100.0, 200.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(0.0, 0.0, 100.0, 175.0),
-                box(-2.0, -2.0, 104.0, 182.0),
-                new BBoxComparator(0.01)));
-
-        return array;
-    }
-
-    public Reflection_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestNode() {
-        Rectangle r = new Rectangle(100, 100);
-        r.setEffect(new Reflection());
-        return r;
-    }
-
-    private static Rectangle createTestNodeWithChainedEffect() {
-        Rectangle r = new Rectangle(100, 100);
-        Glow g = new Glow();
-        g.setInput(new Reflection());
-        r.setEffect(g);
-        return r;
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/SepiaTone_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class SepiaTone_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final SepiaTone testSepiaTone = new SepiaTone();
-
-        return Arrays.asList(new Object[] {
-            config(testSepiaTone, "input", null, new BoxBlur()),
-            config(testSepiaTone, "level", 0.3, 0.6)
-        });
-    }
-
-    public SepiaTone_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/Shadow_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Shadow_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        final Shadow testShadow = new Shadow();
-
-        array.add(config(testShadow, "input", null, new BoxBlur()));
-        array.add(config(testShadow, "radius", 20.0, 40.0));
-        array.add(config(testShadow, "width", 100.0, 200.0));
-        array.add(config(testShadow, "height", 100.0, 200.0));
-        array.add(config(testShadow, "blurType",
-                         BlurType.GAUSSIAN, BlurType.THREE_PASS_BOX));
-        array.add(config(testShadow, "color", Color.BLACK, Color.RED));
-
-        // bounding box calculation tests
-
-        Node testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "radius", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -9.0, 118.0, 118.0),
-                box(-20.0, -20.0, 140.0, 140.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "width", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-3.0, -9.0, 106.0, 118.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "height", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -3.0, 118.0, 106.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "blurType", BlurType.ONE_PASS_BOX, BlurType.THREE_PASS_BOX,
-                testNode,
-                "boundsInLocal",
-                box(-3.0, -3.0, 106.0, 106.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "blurType", BlurType.TWO_PASS_BOX, BlurType.GAUSSIAN,
-                testNode,
-                "boundsInLocal",
-                box(-6.0, -6.0, 112.0, 112.0),
-                box(-10.0, -10.0, 120.0, 120.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNode();
-        array.add(config(testNode.getEffect(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -9.0, 118.0, 118.0),
-                box(-11.0, -11.0, 122.0, 122.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "radius", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -9.0, 118.0, 118.0),
-                box(-20.0, -20.0, 140.0, 140.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "width", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-3.0, -9.0, 106.0, 118.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "height", 10.0, 21.0,
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -3.0, 118.0, 106.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "blurType", BlurType.ONE_PASS_BOX, BlurType.THREE_PASS_BOX,
-                testNode,
-                "boundsInLocal",
-                box(-3.0, -3.0, 106.0, 106.0),
-                box(-9.0, -9.0, 118.0, 118.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "blurType", BlurType.TWO_PASS_BOX, BlurType.GAUSSIAN,
-                testNode,
-                "boundsInLocal",
-                box(-6.0, -6.0, 112.0, 112.0),
-                box(-10.0, -10.0, 120.0, 120.0),
-                new BBoxComparator(0.01)));
-
-        testNode = createTestNodeWithChainedEffect();
-        array.add(config(((Glow)testNode.getEffect()).getInput(),
-                "input", null, new BoxBlur(),
-                testNode,
-                "boundsInLocal",
-                box(-9.0, -9.0, 118.0, 118.0),
-                box(-11.0, -11.0, 122.0, 122.0),
-                new BBoxComparator(0.01)));
-
-        return array;
-    }
-
-    public Shadow_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestNode() {
-        Rectangle r = new Rectangle(100, 100);
-        r.setEffect(new Shadow());
-        return r;
-    }
-
-    private static Rectangle createTestNodeWithChainedEffect() {
-        Rectangle r = new Rectangle(100, 100);
-        Glow g = new Glow();
-        g.setInput(new Shadow());
-        r.setEffect(g);
-        return r;
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/effect/SpotLight_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.effect;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class SpotLight_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Light.Spot testSpotLight = new Light.Spot();
-
-        return Arrays.asList(new Object[] {
-            config(testSpotLight, "pointsAtX", 0.0, 100.0),
-            config(testSpotLight, "pointsAtY", 0.0, 100.0),
-            config(testSpotLight, "pointsAtZ", 0.0, 100.0),
-            config(testSpotLight, "specularExponent", 1.0, 3.0)
-        });
-    }
-
-    public SpotLight_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/ArcTo_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class ArcTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final ArcTo testArcTo = new ArcTo();
-
-        return Arrays.asList(new Object[] {
-            config(testArcTo, "radiusX", 50.0, 150.0),
-            config(testArcTo, "radiusY", 50.0, 150.0),
-            // temporarily disabled, because there is ArcToBuilder.XAxisRotation
-            // instead of ArcToBuilder.xAxisRotation
-            // config(testArcTo, "xAxisRotation", 0.0, 45.0),
-            config(testArcTo, "largeArcFlag", false, true),
-            config(testArcTo, "sweepFlag", false, true),
-            config(testArcTo, "x", 0.0, 100.0),
-            config(testArcTo, "y", 0.0, 100.0)
-        });
-    }
-
-    public ArcTo_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/Arc_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Arc_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Arc testArc = new Arc();
-
-        return Arrays.asList(new Object[] {
-            config(testArc, "centerX", 0.0, 100.0),
-            config(testArc, "centerY", 0.0, 100.0),
-            config(testArc, "radiusX", 50.0, 150.0),
-            config(testArc, "radiusY", 50.0, 150.0),
-            config(testArc, "startAngle", 0.0, 50.0),
-            config(testArc, "length", 40.0, 80.0),
-            config(testArc, "type", ArcType.OPEN, ArcType.ROUND)
-        });
-    }
-
-    public Arc_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/Circle_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Circle_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Circle testCircle = new Circle();
-
-        return Arrays.asList(new Object[] {
-            config(testCircle, "centerX", 0.0, 100.0),
-            config(testCircle, "centerY", 0.0, 100.0),
-            config(testCircle, "radius", 50.0, 150.0)
-        });
-    }
-
-    public Circle_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/CubicCurveTo_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class CubicCurveTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final CubicCurveTo testCubicCurveTo = new CubicCurveTo();
-
-        return Arrays.asList(new Object[] {
-            config(testCubicCurveTo, "controlX1", 20.0, 120.0),
-            config(testCubicCurveTo, "controlY1", 40.0, 140.0),
-            config(testCubicCurveTo, "controlX2", 40.0, 140.0),
-            config(testCubicCurveTo, "controlY2", 20.0, 120.0),
-            config(testCubicCurveTo, "x", 0.0, 100.0),
-            config(testCubicCurveTo, "y", 0.0, 100.0)
-        });
-    }
-
-    public CubicCurveTo_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/CubicCurve_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class CubicCurve_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final CubicCurve testCubicCurve = new CubicCurve();
-
-        return Arrays.asList(new Object[] {
-            config(testCubicCurve, "startX", 0.0, 100.0),
-            config(testCubicCurve, "startY", 0.0, 100.0),
-            config(testCubicCurve, "controlX1", 20.0, 120.0),
-            config(testCubicCurve, "controlY1", 40.0, 140.0),
-            config(testCubicCurve, "controlX2", 40.0, 140.0),
-            config(testCubicCurve, "controlY2", 20.0, 120.0),
-            config(testCubicCurve, "endX", 100.0, 200.0),
-            config(testCubicCurve, "endY", 100.0, 200.0)
-        });
-    }
-
-    public CubicCurve_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/Ellipse_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Ellipse_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Ellipse testEllipse = new Ellipse();
-
-        return Arrays.asList(new Object[] {
-            config(testEllipse, "centerX", 0.0, 100.0),
-            config(testEllipse, "centerY", 0.0, 100.0),
-            config(testEllipse, "radiusX", 50.0, 150.0),
-            config(testEllipse, "radiusY", 50.0, 150.0)
-        });
-    }
-
-    public Ellipse_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/HLineTo_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class HLineTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final HLineTo testHLineTo = new HLineTo();
-
-        return Arrays.asList(new Object[] {
-            config(testHLineTo, "x", 50.0, 100.0)
-        });
-    }
-
-    public HLineTo_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/LineTo_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class LineTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final LineTo testLineTo = new LineTo();
-
-        return Arrays.asList(new Object[] {
-            config(testLineTo, "x", 50.0, 100.0),
-            config(testLineTo, "y", 50.0, 100.0)
-        });
-    }
-
-    public LineTo_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/Line_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Line_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Line testLine = new Line();
-
-        return Arrays.asList(new Object[] {
-            config(testLine, "startX", 0.0, 100.0),
-            config(testLine, "startY", 0.0, 100.0),
-            config(testLine, "endX", 100.0, 0.0),
-            config(testLine, "endY", 100.0, 0.0),
-        });
-    }
-
-    public Line_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/MoveTo_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class MoveTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final MoveTo testMoveTo = new MoveTo();
-
-        return Arrays.asList(new Object[] {
-            config(testMoveTo, "x", 50.0, 100.0),
-            config(testMoveTo, "y", 50.0, 100.0)
-        });
-    }
-
-    public MoveTo_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/Path_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Path_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Path testPath = new Path();
-
-        return Arrays.asList(new Object[] {
-            config(testPath, "fillRule", FillRule.NON_ZERO, FillRule.EVEN_ODD)
-        });
-    }
-
-    public Path_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/QuadCurveTo_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class QuadCurveTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final QuadCurveTo testQuadCurveTo = new QuadCurveTo();
-
-        return Arrays.asList(new Object[] {
-            config(testQuadCurveTo, "controlX", 80.0, 180.0),
-            config(testQuadCurveTo, "controlY", 20.0, 120.0),
-            config(testQuadCurveTo, "x", 100.0, 200.0),
-            config(testQuadCurveTo, "y", 100.0, 200.0)
-        });
-    }
-
-    public QuadCurveTo_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/QuadCurve_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class QuadCurve_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final QuadCurve testQuadCurve = new QuadCurve();
-
-        return Arrays.asList(new Object[] {
-            config(testQuadCurve, "startX", 0.0, 100.0),
-            config(testQuadCurve, "startY", 0.0, 100.0),
-            config(testQuadCurve, "controlX", 80.0, 180.0),
-            config(testQuadCurve, "controlY", 20.0, 120.0),
-            config(testQuadCurve, "endX", 100.0, 200.0),
-            config(testQuadCurve, "endY", 100.0, 200.0)
-        });
-    }
-
-    public QuadCurve_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/Rectangle_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class Rectangle_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Rectangle testRectangle = createTestRectangle();
-        
-        return Arrays.asList(new Object[] {
-            config(testRectangle, "x", 0.0, 100.0),
-            config(testRectangle, "y", 0.0, 200.0),
-            config(testRectangle, "width", 50.0, 200.0),
-            config(testRectangle, "height", 50.0, 200.0),
-            config(testRectangle, "arcWidth", 10.0, 20.0),
-            config(testRectangle, "arcHeight", 10.0, 20.0),
-
-            config(createTestRectangle(),
-                   "x", 0.0, 100.0,
-                   "boundsInLocal",
-                   box(0, 0, 100, 100), box(100, 0, 100, 100)),
-            config(createTestRectangle(),
-                   "y", 0.0, 100.0,
-                   "boundsInLocal",
-                   box(0, 0, 100, 100), box(0, 100, 100, 100)),
-            config(createTestRectangle(),
-                   "width", 50.0, 200.0,
-                   "boundsInLocal",
-                   box(0, 0, 50, 100), box(0, 0, 200, 100)),
-            config(createTestRectangle(),
-                   "height", 50.0, 200.0,
-                   "boundsInLocal",
-                   box(0, 0, 100, 50), box(0, 0, 100, 200)),
-            config(createTestRectangle(),
-                   "x", 0.0, 100.0,
-                   "layoutBounds",
-                   box(0, 0, 100, 100), box(100, 0, 100, 100)),
-            config(createTestRectangle(),
-                   "y", 0.0, 100.0,
-                   "layoutBounds",
-                   box(0, 0, 100, 100), box(0, 100, 100, 100)),
-            config(createTestRectangle(),
-                   "width", 50.0, 200.0,
-                   "layoutBounds",
-                   box(0, 0, 50, 100), box(0, 0, 200, 100)),
-            config(createTestRectangle(),
-                   "height", 50.0, 200.0,
-                   "layoutBounds",
-                   box(0, 0, 100, 50), box(0, 0, 100, 200)),
-            config(createTestRectangle(),
-                   "translateX", 0.0, 100.0,
-                   "boundsInParent", 
-                   box(0, 0, 100, 100), box(100, 0, 100, 100)),
-            config(createTestRectangle(),
-                   "translateY", 0.0, 100.0,
-                   "boundsInParent",
-                   box(0, 0, 100, 100), box(0, 100, 100, 100))
-        });
-    }
-
-    public Rectangle_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestRectangle() {
-        return new Rectangle(100, 100);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/SVGPath_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class SVGPath_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final SVGPath testSvgPath = new SVGPath();
-
-        return Arrays.asList(new Object[] {
-            config(testSvgPath, "fillRule",
-                   FillRule.NON_ZERO, FillRule.EVEN_ODD),
-            config(testSvgPath, "content", "", "M40,60 C42,48 44,30 25,32")
-        });
-    }
-
-    public SVGPath_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/Shape_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import static com.sun.javafx.test.TestHelper.box;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javafx.scene.paint.Color;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.BBoxComparator;
-import com.sun.javafx.test.PropertiesTestBase;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ListChangeListener.Change;
-import javafx.collections.ObservableList;
-
-@RunWith(Parameterized.class)
-public final class Shape_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();        
-
-        // simple property tests
-        Shape testShape = createTestRectangle();
-
-        array.add(config(testShape, "strokeType",
-                  StrokeType.CENTERED, StrokeType.INSIDE));
-        array.add(config(testShape, "strokeWidth", 1.0, 2.0));
-        array.add(config(testShape, "strokeLineJoin",
-                  StrokeLineJoin.MITER, StrokeLineJoin.BEVEL));
-        array.add(config(testShape, "strokeLineCap",
-                  StrokeLineCap.ROUND,  StrokeLineCap.SQUARE));
-        array.add(config(testShape, "strokeMiterLimit", 0.0, 10.0));
-        array.add(config(testShape, "strokeDashOffset", 0.0, 3.0));
-        array.add(config(testShape, "fill", Color.BLACK, null));
-        array.add(config(testShape, "stroke", null, Color.BLACK));
-        array.add(config(testShape, "smooth", true, false));
-
-        // bounding box calculation tests
-        array.add(config(createTestRectangle(),
-                    "strokeWidth", 0.0, 20.0,
-                    "boundsInLocal",
-                    box(0, 0, 100, 100), box(-10, -10, 120, 120)));
-
-        testShape = createTestTriangle();
-        array.add(config(testShape,
-                    "strokeLineJoin", StrokeLineJoin.MITER, StrokeLineJoin.BEVEL,
-                    testShape,
-                    "boundsInLocal",
-                    box(192.562, 33.68, 114.874, 171.811), 
-                    box(194.756, 47.918, 110.486, 157.581),
-                    new BBoxComparator(0.01)));
-
-        testShape = createTestTriangle();
-        array.add(config(testShape,
-                    "strokeMiterLimit", 100.0, 0.0,
-                    testShape,
-                    "boundsInLocal",
-                    box(192.562, 33.68, 114.874, 171.811),
-                    box(194.756, 47.918, 110.486, 157.581),
-                    new BBoxComparator(0.01)));
-
-        testShape = createTestTriangle();
-        array.add(config(testShape,
-                    "strokeType", StrokeType.INSIDE, StrokeType.OUTSIDE,
-                    testShape,
-                    "boundsInLocal",
-                    box(200, 50, 100, 150),
-                    box(185.625, 17.877, 128.748, 192.622),
-                    new BBoxComparator(0.01)));
-
-        testShape = createTestLine();
-        array.add(config(testShape,
-                    "strokeLineCap", StrokeLineCap.BUTT, StrokeLineCap.SQUARE,
-                    testShape,
-                    "boundsInLocal",
-                    box(195, 100, 10, 100),
-                    box(195, 95, 10, 110),
-                    new BBoxComparator(0.001)));
-
-        return array;
-    }
-
-    public Shape_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Rectangle createTestRectangle() {
-        Rectangle r = new Rectangle(100, 100);
-        r.setStroke(Color.BLACK);
-        return r;
-    }
-
-    private static Polygon createTestTriangle() {
-        Polygon p = new Polygon(new double[]{200, 200, 250, 50, 300, 200});
-        p.setStroke(Color.BLACK);
-        p.setStrokeWidth(10);
-        p.setStrokeMiterLimit(100);
-        return p;
-    }
-
-    private static Line createTestLine() {
-        Line l = new Line(200, 100, 200, 200);
-        l.setStroke(Color.BLACK);
-        l.setStrokeWidth(10);
-        return l;
-    }
-    
-}
--- a/javafx-builders/test/unit/javafx/scene/shape/VLineTo_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.shape;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-
-@RunWith(Parameterized.class)
-public final class VLineTo_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final VLineTo testVLineTo = new VLineTo();
-
-        return Arrays.asList(new Object[] {
-            config(testVLineTo, "y", 50.0, 100.0)
-        });
-    }
-
-    public VLineTo_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-builders/test/unit/javafx/scene/transform/Transform_properties_Test.java	Wed May 29 10:09:54 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.scene.transform;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import com.sun.javafx.test.PropertiesTestBase;
-import javafx.geometry.Point3D;
-
-@RunWith(Parameterized.class)
-public class Transform_properties_Test extends PropertiesTestBase {
-    @Parameters
-    public static Collection data() {
-        final Affine a = new Affine(
-                1,  2,  3,  4,
-                5,  6,  7,  8,
-                9, 10, 11, 12);
-
-        final Rotate r = new Rotate();
-        final Shear s = new Shear();
-        final Translate t = new Translate();
-        final Scale c = new Scale();
-
-        return Arrays.asList(new Object[] {
-            config(a, "mxx", 10.0, 20.0),
-            config(a, "mxy", 10.0, 20.0),
-            config(a, "mxz", 10.0, 20.0),
-            config(a, "tx", 10.0, 20.0),
-            config(a, "myx", 10.0, 20.0),
-            config(a, "myy", 10.0, 20.0),
-            config(a, "myz", 10.0, 20.0),
-            config(a, "ty", 10.0, 20.0),
-            config(a, "mzx", 10.0, 20.0),
-            config(a, "mzy", 10.0, 20.0),
-            config(a, "mzz", 10.0, 20.0),
-            config(a, "tz", 10.0, 20.0),
-            config(r, "angle", 10.0, 20.0),
-            config(r, "axis", new Point3D(10, 20, 30), new Point3D(30, 20, 10)),
-            config(r, "pivotX", 10.0, 20.0),
-            config(r, "pivotY", 10.0, 20.0),
-            config(r, "pivotZ", 10.0, 20.0),
-            config(s, "x", 10.0, 20.0),
-            config(s, "y", 10.0, 20.0),
-            config(s, "pivotX", 10.0, 20.0),
-            config(s, "pivotY", 10.0, 20.0),
-            config(t, "x", 10.0, 20.0),
-            config(t, "y", 10.0, 20.0),
-            config(t, "z", 10.0, 20.0),
-            config(c, "x", 10.0, 20.0),
-            config(c, "y", 10.0, 20.0),
-            config(c, "z", 10.0, 20.0),
-            config(c, "pivotX", 10.0, 20.0),
-            config(c, "pivotY", 10.0, 20.0),
-            config(c, "pivotZ", 10.0, 20.0),
-        });
-    }
-
-    public Transform_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-}
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/FXVKSkin.java	Wed May 29 10:09:54 2013 -0700
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/FXVKSkin.java	Wed May 29 16:37:39 2013 -0400
@@ -25,16 +25,20 @@
 
 package com.sun.javafx.scene.control.skin;
 
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.lang.reflect.Field;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
-import javafx.animation.Animation;
-import javafx.animation.Animation.Status;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -44,42 +48,29 @@
 import javafx.event.EventHandler;
 import javafx.event.EventTarget;
 import javafx.event.EventType;
+import javafx.geometry.HPos;
+import javafx.geometry.Point2D;
 import javafx.geometry.Rectangle2D;
 import javafx.geometry.VPos;
-
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.geometry.Point2D;
-import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.input.InputEvent;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
-import javafx.scene.input.TouchEvent;
-import javafx.scene.input.InputEvent;
-import static javafx.scene.input.TouchEvent.*;
-import static javafx.scene.input.MouseEvent.*;
-import static javafx.scene.input.KeyEvent.*;
-import javafx.stage.*;
+import javafx.scene.layout.Region;
+import javafx.scene.text.Text;
+import javafx.stage.Popup;
 import javafx.util.Duration;
-
+import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.robot.impl.FXRobotHelper;
 import com.sun.javafx.robot.impl.FXRobotHelper.FXRobotInputAccessor;
 import com.sun.javafx.scene.control.behavior.BehaviorBase;
 
+import static javafx.scene.input.MouseEvent.*;
+import static javafx.scene.input.TouchEvent.*;
 import static javafx.scene.layout.Region.*;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javafx.scene.layout.Region;
-import javafx.scene.text.Text;
-import com.sun.javafx.css.StyleManager;
-
 
 public class FXVKSkin extends BehaviorSkinBase<FXVK, BehaviorBase<FXVK>> {
 
@@ -234,6 +225,51 @@
 
     EventHandler<InputEvent> unHideEventHandler;
 
+    private boolean isVKHidden = false;
+    
+    private void registerUnhideHandler(final Node node) {
+        if (unHideEventHandler == null) {
+            unHideEventHandler = new EventHandler<InputEvent> () {
+                public void handle(InputEvent event) {
+                    if (node != null && isVKHidden) {
+                        double screenHeight = com.sun.javafx.Utils.getScreen(node).getBounds().getHeight();
+                        if (fxvk.getHeight() > 0 && (vkPopup.getY() > screenHeight - fxvk.getHeight())) {
+                            if (slideInTimeline.getStatus() != Animation.Status.RUNNING) {
+                                startSlideIn();
+                            }
+                        }
+                    }
+                    isVKHidden = false;
+                }                    
+            };
+        }
+        attachedNode.addEventHandler(TOUCH_PRESSED, unHideEventHandler);
+        attachedNode.addEventHandler(MOUSE_PRESSED, unHideEventHandler);
+    }
+
+    private void unRegisterUnhideHandler(Node node) {
+        if (unHideEventHandler != null) {
+            node.removeEventHandler(TOUCH_PRESSED, unHideEventHandler);
+            node.removeEventHandler(MOUSE_PRESSED, unHideEventHandler);
+        }
+    }
+
+    private void updateKeyboardType() {
+        String oldType = vkType;
+        int typeIndex = 0;
+        Object typeValue = attachedNode.getProperties().get(FXVK.VK_TYPE_PROP_KEY);
+        String typeStr = null;
+        if (typeValue instanceof String) {
+            typeStr = ((String)typeValue).toLowerCase();
+        }
+        vkType = (typeStr != null ? typeStr : "text");
+        
+        //VK type changed, rebuild
+        if ( oldType == null || !vkType.equals(oldType) ) {
+            rebuild();
+        }
+    }
+
     public FXVKSkin(final FXVK fxvk) {
         super(fxvk, new BehaviorBase<FXVK>(fxvk));
         this.fxvk = fxvk;
@@ -242,11 +278,27 @@
 
         fxvk.setFocusTraversable(false);
 
+        if (fxvk != secondaryVK) {
+            //init secondary VK delay animation
+            if (secondaryVKDelay == null) {
+                secondaryVKDelay = new Timeline();
+            }
+            KeyFrame kf = new KeyFrame(Duration.millis(500), new EventHandler<ActionEvent>() {
+                @Override public void handle(ActionEvent event) {
+                    if (secondaryVKKey != null) {
+                        showSecondaryVK(secondaryVKKey);
+                    }
+                }
+            });
+            secondaryVKDelay.getKeyFrames().setAll(kf);
+        }
+
+
         fxvk.attachedNodeProperty().addListener(new InvalidationListener() {
             @Override public void invalidated(Observable valueModel) {
                 Node oldNode = attachedNode;
                 attachedNode = fxvk.getAttachedNode();
-
+                isVKHidden = false;
                 if (fxvk != FXVK.vk) {
                     // This is not the current vk, so nothing more to do
                     return;
@@ -255,54 +307,23 @@
                     return;
                 }
                 
+                //close secondary VK if open
+                if (secondaryVK != null) {
+                    secondaryVK.setAttachedNode(null);
+                    secondaryPopup.hide();
+                }
+                
                 if (attachedNode != null) {
-                    if (unHideEventHandler == null) {
-                        unHideEventHandler = new EventHandler<InputEvent> (){
-                            public void handle(InputEvent event) {
-                                if (attachedNode != null) {
-                                    double screenHeight = com.sun.javafx.Utils.getScreen(attachedNode).getBounds().getHeight();
-                                    if (fxvk.getHeight() > 0 && (vkPopup.getY() > screenHeight - fxvk.getHeight())) {
-                                        if (slideInTimeline.getStatus() != Animation.Status.RUNNING) {
-                                            startSlideIn();
-                                        }
-                                    }
-                                }
-                            }                    
-                        };
+                    if (oldNode != null) {
+                        unRegisterUnhideHandler(oldNode);
                     }
-                    attachedNode.addEventHandler(TOUCH_PRESSED, unHideEventHandler);
-                    attachedNode.addEventHandler(MOUSE_PRESSED, unHideEventHandler);
-                    attachedNode.addEventHandler(KEY_PRESSED, unHideEventHandler);                    
-                    String oldType = vkType;
-                    int typeIndex = 0;
-
-                    Object typeValue = attachedNode.getProperties().get(FXVK.VK_TYPE_PROP_KEY);
-                    String typeStr = null;
-                    if (typeValue instanceof String) {
-                        typeStr = ((String)typeValue).toLowerCase();
-                    }
-                    vkType = (typeStr != null ? typeStr : "text");
+                    registerUnhideHandler(attachedNode);
+                    updateKeyboardType();
                     
-                    if ( oldType == null || !vkType.equals(oldType) ) {
-                        rebuild();
-                    }
-
-                    final Scene scene = attachedNode.getScene();
                     fxvk.setVisible(true);
 
                     if (fxvk != secondaryVK) {
-                        if (secondaryVKDelay == null) {
-                            secondaryVKDelay = new Timeline();
-                        }
-                        KeyFrame kf = new KeyFrame(Duration.millis(500), new EventHandler<ActionEvent>() {
-                            @Override public void handle(ActionEvent event) {
-                                if (secondaryVKKey != null) {
-                                    showSecondaryVK(secondaryVKKey);
-                                }
-                            }
-                        });
-                        secondaryVKDelay.getKeyFrames().setAll(kf);
-                        
+                        // init popup window and slide animations
                         if (vkPopup == null) {
                             vkPopup = new Popup();
                             vkPopup.setAutoFix(false);
@@ -325,14 +346,20 @@
 
                         vkPopup.getContent().setAll(fxvk);
 
+                        //owner window has changed so hide VK and show with new owner
+                        if (oldNode == null || oldNode.getScene() == null || oldNode.getScene().getWindow() != attachedNode.getScene().getWindow()) {
+                            if (vkPopup.isShowing()) {
+                                vkPopup.hide();
+                            }
+                        }
+                        
                         if (!vkPopup.isShowing()) {
                             Platform.runLater(new Runnable() {
                                 public void run() {
                                     Rectangle2D screenBounds =
                                         com.sun.javafx.Utils.getScreen(attachedNode).getBounds();
 
-                                        
-                                    vkPopup.show(attachedNode,
+                                    vkPopup.show(attachedNode.getScene().getWindow(),
                                                  (screenBounds.getWidth() - fxvk.prefWidth(-1)) / 2,
                                                  screenBounds.getHeight() - fxvk.prefHeight(-1));
                                 }
@@ -350,16 +377,14 @@
                         }
 
                         if (fxvk.getHeight() > 0 &&
-                                (fxvk.getLayoutY() == 0 || fxvk.getLayoutY() > scene.getHeight() - fxvk.getHeight())) {
+                                (fxvk.getLayoutY() == 0 || fxvk.getLayoutY() > attachedNode.getScene().getHeight() - fxvk.getHeight())) {
                             startSlideIn();
                         }
                     }
                 } else {
                     if (fxvk != secondaryVK) {
-                        if (oldNode != null && unHideEventHandler != null) {
-                            oldNode.removeEventHandler(TOUCH_PRESSED, unHideEventHandler);
-                            oldNode.removeEventHandler(MOUSE_PRESSED, unHideEventHandler);
-                            oldNode.removeEventHandler(KEY_PRESSED, unHideEventHandler);
+                        if (oldNode != null) {
+                            unRegisterUnhideHandler(oldNode);
                         }
                         startSlideOut();
                     }
@@ -953,6 +978,7 @@
                             } else if ("$hide".equals(chars)) {
                                 key = new KeyboardStateKey("Hide", null) {
                                     @Override protected void release() {
+                                        isVKHidden = true;
                                         startSlideOut();
                                     }
                                 };