--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ColorPickerPaletteRetriever.java	2015-09-03 15:27:21.350874500 -0700
+++ /dev/null	2015-09-03 15:27:22.000000000 -0700
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2011, 2014, 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.scene.control.skin;
-
-import javafx.scene.control.ColorPicker;
-import javafx.scene.control.Hyperlink;
-import javafx.scene.control.PopupControl;
-import javafx.stage.Stage;
-
-
-/**
- *
- */
-public class ColorPickerPaletteRetriever {
-    
-    public static ColorPalette getColorPalette(ColorPicker cp) {
-        ColorPickerSkin cpSkin = (ColorPickerSkin)cp.getSkin();
-        return (ColorPalette)cpSkin.getPopupContent();
-    }
-    
-//    public static ColorPalette.ColorPickerGrid getColorGrid(ColorPalette colorPalette) {
-//        return colorPalette.colorPickerGrid;
-//    }
-    
-    public static PopupControl getPopup(ColorPicker cp) {
-        ColorPickerSkin cpSkin = (ColorPickerSkin)cp.getSkin();
-        return cpSkin.getPopup();
-    }
-    
-    public static Hyperlink getCustomColorLink(ColorPalette cp) {
-        return cp.customColorLink;
-    }
-    
-    public static Stage getCustomColorDialog(ColorPalette cp) {
-        if (cp.customColorDialog != null) return cp.customColorDialog.getDialog();
-        return null;
-    }
-}
--- /dev/null	2015-09-03 15:27:22.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ColorPickerPaletteRetriever.java	2015-09-03 15:27:20.564829500 -0700
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2011, 2014, 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.control.skin;
+
+import javafx.scene.control.ColorPicker;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.PopupControl;
+import javafx.stage.Stage;
+
+
+/**
+ *
+ */
+public class ColorPickerPaletteRetriever {
+    
+    public static ColorPalette getColorPalette(ColorPicker cp) {
+        ColorPickerSkin cpSkin = (ColorPickerSkin)cp.getSkin();
+        return (ColorPalette)cpSkin.getPopupContent();
+    }
+    
+//    public static ColorPalette.ColorPickerGrid getColorGrid(ColorPalette colorPalette) {
+//        return colorPalette.colorPickerGrid;
+//    }
+    
+    public static PopupControl getPopup(ColorPicker cp) {
+        ColorPickerSkin cpSkin = (ColorPickerSkin)cp.getSkin();
+        return cpSkin.getPopup();
+    }
+    
+    public static Hyperlink getCustomColorLink(ColorPalette cp) {
+        return cp.customColorLink;
+    }
+    
+    public static Stage getCustomColorDialog(ColorPalette cp) {
+        if (cp.customColorDialog != null) return cp.customColorDialog.getDialog();
+        return null;
+    }
+}