--- old/modules/controls/src/main/java/javafx/scene/control/Spinner.java	2015-09-03 14:58:05.031418800 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Spinner.java	2015-09-03 14:58:04.400382700 -0700
@@ -24,8 +24,9 @@
  */
 package javafx.scene.control;
 
-import com.sun.javafx.scene.control.skin.ComboBoxListViewSkin;
-import com.sun.javafx.scene.control.skin.SpinnerSkin;
+import com.sun.javafx.scene.control.FakeFocusTextField;
+import javafx.scene.control.skin.ComboBoxListViewSkin;
+import javafx.scene.control.skin.SpinnerSkin;
 import javafx.beans.NamedArg;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -541,8 +542,8 @@
      */
     public final ReadOnlyObjectProperty<TextField> editorProperty() {
         if (editor == null) {
-            editor = new ReadOnlyObjectWrapper<TextField>(this, "editor");
-            textField = new ComboBoxListViewSkin.FakeFocusTextField();
+            editor = new ReadOnlyObjectWrapper<>(this, "editor");
+            textField = new FakeFocusTextField();
             editor.set(textField);
         }
         return editor.getReadOnlyProperty();