--- old/modules/graphics/src/test/java/com/sun/javafx/css/TestNode.java	2015-09-11 21:23:50.405287372 -0400
+++ /dev/null	2015-09-11 11:06:08.592686920 -0400
@@ -1,125 +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.css;
-
-import javafx.css.converter.SizeConverter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javafx.beans.property.DoubleProperty;
-import javafx.css.CssMetaData;
-import javafx.css.Styleable;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.StyleableProperty;
-
-/** Test Node with styleable property but no getClassCssMetaData method */
-public class TestNode extends TestNodeBase {
-
-    private DoubleProperty xyzzy;
-    private DoubleProperty xyzzyProperty() {
-        if (xyzzy == null) {
-            xyzzy = new StyleableDoubleProperty(.5) {
-
-                @Override
-                public Object getBean() {
-                    return TestNode.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "xyzzy";
-                }
-
-                @Override
-                public CssMetaData<TestNode, Number> getCssMetaData() {
-                    return StyleableProperties.XYZZY;
-                }
-                
-            };
-        }
-        return xyzzy;
-    }
-    
-    public void setXyzzy(double number) {
-        xyzzyProperty().set(number);
-    }
-    
-    public double getXyzzy() {
-        return (xyzzy == null ? .5 : xyzzy.get());
-    }
-
-    public TestNode() {
-        super();
-    }
-    
-    public static class StyleableProperties {
-
-         public static final CssMetaData<TestNode, Number> XYZZY = 
-             new CssMetaData<TestNode, Number>("-fx-xyzzy",
-                 SizeConverter.getInstance(),
-                 .5) {
-
-            @Override
-            public boolean isSettable(TestNode node) {
-                return node.xyzzy == null || !node.xyzzy.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Number> getStyleableProperty(TestNode node) {
-                return (StyleableProperty<Number>)node.xyzzyProperty();
-            }
-                     
-         };
-            
-         private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-         static {
-            final List<CssMetaData<? extends Styleable, ?>> styleables = 
-		new ArrayList<CssMetaData<? extends Styleable, ?>>(TestNodeBase.getClassCssMetaData());
-            styleables.add(XYZZY);
-            STYLEABLES = Collections.unmodifiableList(styleables);
-         }
-    }
-
-    /**
-     * @return The CssMetaData associated with this class, which may include the
-     * CssMetaData of its super classes.
-     */
-    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
-        return StyleableProperties.STYLEABLES;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     */
-    
-    
-    @Override
-    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
-        return getClassCssMetaData();
-    }
-
-}
--- /dev/null	2015-09-11 11:06:08.592686920 -0400
+++ new/modules/graphics/src/test/java/test/com/sun/javafx/css/TestNode.java	2015-09-11 21:23:50.265287374 -0400
@@ -0,0 +1,125 @@
+/*
+ * 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 test.com.sun.javafx.css;
+
+import javafx.css.converter.SizeConverter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javafx.beans.property.DoubleProperty;
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableProperty;
+
+/** Test Node with styleable property but no getClassCssMetaData method */
+public class TestNode extends TestNodeBase {
+
+    private DoubleProperty xyzzy;
+    private DoubleProperty xyzzyProperty() {
+        if (xyzzy == null) {
+            xyzzy = new StyleableDoubleProperty(.5) {
+
+                @Override
+                public Object getBean() {
+                    return TestNode.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "xyzzy";
+                }
+
+                @Override
+                public CssMetaData<TestNode, Number> getCssMetaData() {
+                    return StyleableProperties.XYZZY;
+                }
+                
+            };
+        }
+        return xyzzy;
+    }
+    
+    public void setXyzzy(double number) {
+        xyzzyProperty().set(number);
+    }
+    
+    public double getXyzzy() {
+        return (xyzzy == null ? .5 : xyzzy.get());
+    }
+
+    public TestNode() {
+        super();
+    }
+    
+    public static class StyleableProperties {
+
+         public static final CssMetaData<TestNode, Number> XYZZY = 
+             new CssMetaData<TestNode, Number>("-fx-xyzzy",
+                 SizeConverter.getInstance(),
+                 .5) {
+
+            @Override
+            public boolean isSettable(TestNode node) {
+                return node.xyzzy == null || !node.xyzzy.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Number> getStyleableProperty(TestNode node) {
+                return (StyleableProperty<Number>)node.xyzzyProperty();
+            }
+                     
+         };
+            
+         private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+         static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = 
+		new ArrayList<CssMetaData<? extends Styleable, ?>>(TestNodeBase.getClassCssMetaData());
+            styleables.add(XYZZY);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+         }
+    }
+
+    /**
+     * @return The CssMetaData associated with this class, which may include the
+     * CssMetaData of its super classes.
+     */
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.STYLEABLES;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     */
+    
+    
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+}